2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-07 00:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BufferUnderflow when loading players, reported by avatarscape.

Browse Source
This commit is contained in:
Major-
2014-07-19 14:11:35 +01:00
parent 9d05349b26
commit f58c4784fa
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/io/player/impl/BinaryPlayerSaver.java
+8 -11
View File
@@ -5,8 +5,8 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import org.apollo.game.model.Appearance; import org.apollo.game.model.Appearance;
import org.apollo.game.model.Item; import org.apollo.game.model.Item;
@@ -15,10 +15,9 @@ import org.apollo.game.model.entity.Player;
import org.apollo.game.model.entity.Skill; import org.apollo.game.model.entity.Skill;
import org.apollo.game.model.entity.SkillSet; import org.apollo.game.model.entity.SkillSet;
import org.apollo.game.model.entity.attr.Attribute; import org.apollo.game.model.entity.attr.Attribute;
import org.apollo.game.model.entity.attr.AttributeDefinition;
import org.apollo.game.model.entity.attr.AttributeMap; import org.apollo.game.model.entity.attr.AttributeMap;
import org.apollo.game.model.entity.attr.AttributeType;
import org.apollo.game.model.entity.attr.AttributePersistence; import org.apollo.game.model.entity.attr.AttributePersistence;
import org.apollo.game.model.entity.attr.AttributeType;
import org.apollo.game.model.inv.Inventory; import org.apollo.game.model.inv.Inventory;
import org.apollo.io.player.PlayerSaver; import org.apollo.io.player.PlayerSaver;
import org.apollo.util.NameUtil; import org.apollo.util.NameUtil;
@@ -95,17 +94,15 @@ public final class BinaryPlayerSaver implements PlayerSaver {
out.writeLong(NameUtil.encodeBase37(username)); out.writeLong(NameUtil.encodeBase37(username));
} }
Map<String, Attribute<?>> attributes = player.getAttributes(); Set<Entry<String, Attribute<?>>> attributes = player.getAttributes().entrySet();
attributes
.removeIf(e -> AttributeMap.getDefinition(e.getKey()).getPersistence() != AttributePersistence.SERIALIZED);
out.writeInt(attributes.size()); out.writeInt(attributes.size());
for (Entry<String, Attribute<?>> entry : attributes.entrySet()) { for (Entry<String, Attribute<?>> entry : attributes) {
String name = entry.getKey(); String name = entry.getKey();
AttributeDefinition<?> definition = AttributeMap.getDefinition(name); StreamUtil.writeString(out, name);
saveAttribute(out, entry.getValue());
if (definition.getPersistence() == AttributePersistence.SERIALIZED) {
StreamUtil.writeString(out, name);
saveAttribute(out, entry.getValue());
}
} }
} }
} }