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

Store the caster UUID regardless of whether the entity actually exists, and only read the UUID if it exists in the tag compound

Browse Source
This commit is contained in:
Electroblob77
2020-06-19 16:33:57 +01:00
parent daf174ec3f
commit a87eca3bd8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/construct/EntityMagicConstruct.java
+3 -3
View File
@@ -103,15 +103,15 @@ public abstract class EntityMagicConstruct extends Entity implements IEntityOwna
@Override
protected void readEntityFromNBT(NBTTagCompound nbttagcompound){
casterUUID = nbttagcompound.getUniqueId("casterUUID");
if(nbttagcompound.hasUniqueId("casterUUID")) casterUUID = nbttagcompound.getUniqueId("casterUUID");
lifetime = nbttagcompound.getInteger("lifetime");
damageMultiplier = nbttagcompound.getFloat("damageMultiplier");
}
@Override
protected void writeEntityToNBT(NBTTagCompound nbttagcompound){
if(this.getCaster() != null){
nbttagcompound.setUniqueId("casterUUID", this.getCaster().getUniqueID());
if(casterUUID != null){
nbttagcompound.setUniqueId("casterUUID", casterUUID);
}
nbttagcompound.setInteger("lifetime", lifetime);
nbttagcompound.setFloat("damageMultiplier", damageMultiplier);
src/main/java/electroblob/wizardry/tileentity/TileEntityPlayerSave.java
+2 -2
View File
@@ -29,7 +29,7 @@ public class TileEntityPlayerSave extends TileEntity {
@Override
public void readFromNBT(NBTTagCompound tagCompound){
super.readFromNBT(tagCompound);
casterUUID = tagCompound.getUniqueId("casterUUID");
if(tagCompound.hasUniqueId("casterUUID")) casterUUID = tagCompound.getUniqueId("casterUUID");
}
@Override
@@ -37,7 +37,7 @@ public class TileEntityPlayerSave extends TileEntity {
super.writeToNBT(tagCompound);
if(this.getCaster() != null){
if(casterUUID != null){
tagCompound.setUniqueId("casterUUID", casterUUID);
}