fix NPE on death (closes #22)

samolego · Jun 14, 2021 · d23c269 · d23c269
1 parent 484e883
commit d23c269
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/common/src/main/java/org/samo_lego/taterzens/api/TaterzensAPI.java b/common/src/main/java/org/samo_lego/taterzens/api/TaterzensAPI.java
@@ -95,7 +95,7 @@ public static TaterzenNPC loadTaterzenFromPreset(File preset, World world) {
      */
     public static void saveTaterzenToPreset(TaterzenNPC taterzen, File preset) {
         NbtCompound saveTag = new NbtCompound();
-        taterzen.saveNbt(saveTag);
+        taterzen.writeNbt(saveTag);
 
         //todo Weird as it is, those cannot be read back :(
         saveTag.remove("ArmorDropChances");

diff --git a/...rc/main/java/org/samo_lego/taterzens/mixin/ServerPlayNetworkHandlerMixin_PacketFaker.java b/...rc/main/java/org/samo_lego/taterzens/mixin/ServerPlayNetworkHandlerMixin_PacketFaker.java
@@ -83,10 +83,9 @@ private void changeEntityType(Packet<?> packet, GenericFutureListener<? extends
         if(packet instanceof PlayerSpawnS2CPacket && !this.taterzens$skipCheck) {
             Entity entity = world.getEntityById(((PlayerSpawnS2CPacketAccessor) packet).getId());
 
-            if(!(entity instanceof TaterzenNPC))
+            if(!(entity instanceof TaterzenNPC npc))
                 return;
 
-            TaterzenNPC npc = (TaterzenNPC) entity;
             GameProfile profile = npc.getGameProfile();
 
             PlayerListS2CPacket playerAddPacket = new PlayerListS2CPacket(ADD_PLAYER);

diff --git a/common/src/main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java b/common/src/main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java
@@ -991,7 +991,7 @@ public void onDeath(DamageSource source) {
 
     @Override
     public void remove(Entity.RemovalReason reason) {
-        super.remove(null);
+        super.remove(reason);
         TATERZEN_NPCS.remove(this);
 
         for(TaterzenProfession profession : this.professions.values()) {

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ fabric_version=0.34.9+1.17
 forge_version=36.0.46
 
 # Mod Properties
-mod_version = 1.1.2
+mod_version = 1.1.3
 maven_group = org.samo_lego
 archives_base_name = taterzens