fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add condition to only write magic projectile thrower to spawn data if the thrower exists and tweak overrides so it is always written/read last, fixes #71

Browse Source
This commit is contained in:
Electroblob77
2019-01-04 20:04:43 +00:00
parent 83edb8007e
commit 98b334e6d7
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/projectile/EntityBomb.java
+2 -2
View File
@@ -36,14 +36,14 @@ public abstract class EntityBomb extends EntityMagicProjectile {
@Override @Override
public void writeSpawnData(ByteBuf buffer){ public void writeSpawnData(ByteBuf buffer){
super.writeSpawnData(buffer);
buffer.writeFloat(blastMultiplier); buffer.writeFloat(blastMultiplier);
super.writeSpawnData(buffer);
} }
@Override @Override
public void readSpawnData(ByteBuf buffer){ public void readSpawnData(ByteBuf buffer){
super.readSpawnData(buffer);
blastMultiplier = buffer.readFloat(); blastMultiplier = buffer.readFloat();
super.readSpawnData(buffer);
} }
@Override @Override
src/main/java/electroblob/wizardry/entity/projectile/EntityMagicProjectile.java
+9 -4
View File
@@ -107,15 +107,20 @@ public abstract class EntityMagicProjectile extends EntityThrowable implements I
} }
@Override @Override
// For now, we're only writing when the thrower exists, so subclasses MUST CALL SUPER LAST.
// TODO: Figure out whether there's a default value we can write that is never used as an entity id (0? -1? +/-MAX_VALUE?)
public void writeSpawnData(ByteBuf data){ public void writeSpawnData(ByteBuf data){
data.writeInt(this.getThrower().getEntityId()); if(this.getThrower() != null) data.writeInt(this.getThrower().getEntityId());
} }
@Override @Override
// For now, we're only writing when the thrower exists, so subclasses MUST CALL SUPER LAST.
public void readSpawnData(ByteBuf data){ public void readSpawnData(ByteBuf data){
Entity entity = this.world.getEntityByID(data.readInt()); if(data.isReadable()){
if(entity instanceof EntityLivingBase) this.thrower = (EntityLivingBase)entity; Entity entity = this.world.getEntityByID(data.readInt());
this.ignoreEntity = this.thrower; if(entity instanceof EntityLivingBase) this.thrower = (EntityLivingBase)entity;
this.ignoreEntity = this.thrower;
}
} }
} }