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

That's one heck of a commit you've got there...

Browse Source 
I may have got a bit behind with version control. A lot behind, in fact. Maybe I'll go back and split this sometime - then again, I probably won't. But hey, at least it's here!
This commit is contained in:
Electroblob77
2019-08-18 00:04:18 +01:00
parent 2680d02304
commit f37812be3e
1564 changed files with 47652 additions and 12984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/tileentity/TileEntityStatue.java
+4 -5
View File
@@ -18,7 +18,7 @@ public class TileEntityStatue extends TileEntity implements ITickable {
public EntityLiving creature;
private NBTTagCompound entityCompound;
private String entityName;
private ResourceLocation entityName;
private float entityYawHead;
private float entityYawOffset;
public boolean isIce;
@@ -95,8 +95,7 @@ public class TileEntityStatue extends TileEntity implements ITickable {
// System.out.println(entityName);
if(this.creature == null && entityName != null){
this.creature = (EntityLiving)EntityList.createEntityByIDFromName(new ResourceLocation(this.entityName),
this.world);
this.creature = (EntityLiving)EntityList.createEntityByIDFromName(this.entityName, this.world);
if(this.creature != null){
this.creature.readFromNBT(entityCompound);
this.creature.rotationYawHead = this.entityYawHead;
@@ -133,7 +132,7 @@ public class TileEntityStatue extends TileEntity implements ITickable {
position = tagCompound.getInteger("position");
parts = tagCompound.getInteger("parts");
entityCompound = tagCompound.getCompoundTag("entity");
entityName = tagCompound.getString("entityName");
entityName = new ResourceLocation(tagCompound.getString("entityName"));
timer = tagCompound.getInteger("timer");
lifetime = tagCompound.getInteger("lifetime");
isIce = tagCompound.getBoolean("isIce");
@@ -149,7 +148,7 @@ public class TileEntityStatue extends TileEntity implements ITickable {
entityCompound = new NBTTagCompound();
if(creature != null){
creature.writeToNBT(entityCompound);
tagCompound.setString("entityName", EntityList.getEntityString(creature));
tagCompound.setString("entityName", EntityList.getKey(creature).toString());
tagCompound.setFloat("entityYawHead", creature.rotationYawHead);
tagCompound.setFloat("entityYawOffset", creature.renderYawOffset);
}