From 545db302ad3903bb7e75e0fc4840b5f21c01f1e3 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Sat, 2 Jul 2022 23:38:20 -0400 Subject: [PATCH] Drowning Compatibility --- src/main/java/noppes/npcs/DataStats.java | 9 ++------- src/main/java/noppes/npcs/VersionCompatibility.java | 6 ++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/DataStats.java b/src/main/java/noppes/npcs/DataStats.java index c7a9af65d..80919713f 100644 --- a/src/main/java/noppes/npcs/DataStats.java +++ b/src/main/java/noppes/npcs/DataStats.java @@ -30,7 +30,7 @@ public class DataStats { public boolean immuneToFire = false; public boolean potionImmune = false; - public int drowningType = 1; //0 - Never, 1 - Water, 2 - Air + public int drowningType = 1; // 0 - Never, 1 - Water, 2 - Air public boolean burnInSun = false; public boolean noFallDamage = false; public float healthRegen = 1; @@ -164,12 +164,7 @@ public class DataStats { immuneToFire = compound.getBoolean("ImmuneToFire"); potionImmune = compound.getBoolean("PotionImmune"); - //canDrown = compound.getBoolean("CanDrown"); - if (!compound.hasKey("DrowningType") && compound.hasKey("CanDrown")) { - drowningType = compound.getBoolean("CanDrown") ? 1 : 0; - } else { - drowningType = compound.getInteger("DrowningType"); - } + drowningType = compound.getInteger("DrowningType"); burnInSun = compound.getBoolean("BurnInSun"); noFallDamage = compound.getBoolean("NoFallDamage"); diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java index bcc045b23..b0de780f7 100644 --- a/src/main/java/noppes/npcs/VersionCompatibility.java +++ b/src/main/java/noppes/npcs/VersionCompatibility.java @@ -24,6 +24,12 @@ public class VersionCompatibility { String texture = compound.getString("Texture"); texture = texture.replace("64-Textures/", ""); compound.setString("Texture", texture); + + if (compound.hasKey("CanDrown")) { + compound.setInteger("DrowningType", (compound.getBoolean("CanDrown") ? 1 : 0)); + compound.removeTag("CanDrown"); + } + } if(npc.npcVersion < 18){ // Fix CloakTexture (Reorganization)