1.3.2d

Author: SoLegendary

TODO.txt

@@ -1,5 +1,5 @@
 
-1.20.1-1.3.3
+1.20.1-1.3.2d
 
 [✔] Done and tested
 [🟡] Partially done and/or needs testing
@@ -33,8 +33,6 @@ Quality of Life
 
 Balance
 -------
-[✔] The wretched wraith now fully immune to knockback and has no collision at all times
-
 
 Languages
 ---------

build.gradle

@@ -23,7 +23,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 
-version = '1.3.3'
+version = '1.3.2d'
 group = 'com.solegendary.reignofnether' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'reignofnether'
 

src/main/java/com/solegendary/reignofnether/ReignOfNether.java

@@ -54,7 +54,7 @@
 public class ReignOfNether {
     public static final Logger LOGGER = LogManager.getLogger();
     public static final String MOD_ID = "reignofnether";
-    public static final String VERSION_STRING = "1.3.3";
+    public static final String VERSION_STRING = "1.3.2d";
 
     // Fields from ClientReset
     public static final Field handshakeField;

src/main/java/com/solegendary/reignofnether/ability/BuildingAbilityClientboundPacket.java

@@ -46,7 +46,7 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
         final var success = new AtomicBoolean(false);
         ctx.get().enqueueWork(() -> {
             BuildingPlacement building = BuildingUtils.findBuilding(true, buildingPos);
-            if (building.getBuilding() instanceof Library) {
+            if (building != null && building.getBuilding() instanceof Library) {
                 Ability ability = null;
                 for (Ability abl : building.getAbilities())
                     if (abl.action == abilityAction)
@@ -58,7 +58,7 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                         building.getDataStorage().setData(Library.AUTO_CAST_ENCHANT, enchantAbility);
                 }
             }
-            else if (building.getBuilding() instanceof Blacksmith blacksmith) {
+            else if (building != null && building.getBuilding() instanceof Blacksmith) {
                 Ability ability = null;
                 for (Ability abl : building.getAbilities())
                     if (abl.action == abilityAction)

src/main/java/com/solegendary/reignofnether/ability/BuildingAbilityServerboundPacket.java

@@ -57,7 +57,7 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
             }
 
             BuildingPlacement building = BuildingUtils.findBuilding(false, buildingPos);
-            if (building.getBuilding() instanceof Library) {
+            if (building != null && building.getBuilding() instanceof Library) {
                 if (!player.getName().getString().equals(building.ownerName)) {
                     ReignOfNether.LOGGER.warn("EnchantEquipAbilityServerboundPacket: Tried to process packet from " + player.getName() + " for: " + building.ownerName);
                     success.set(false);
@@ -74,7 +74,7 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                         building.getDataStorage().setData(Library.AUTO_CAST_ENCHANT, enchantAbility);
                 }
             }
-            else if (building.getBuilding() instanceof Blacksmith blacksmith) {
+            else if (building != null && building.getBuilding() instanceof Blacksmith) {
                 if (!player.getName().getString().equals(building.ownerName)) {
                     ReignOfNether.LOGGER.warn("EnchantEquipAbilityServerboundPacket: Tried to process packet from " + player.getName() + " for: " + building.ownerName);
                     success.set(false);

src/main/java/com/solegendary/reignofnether/building/BuildingServerEvents.java

@@ -615,10 +615,11 @@ public static void onPlayerBlockBreak(BlockEvent.BreakEvent evt) {
     public static void onLivingSpawn(MobSpawnEvent.FinalizeSpawn evt) {
         if (evt.getSpawnType() == MobSpawnType.SPAWNER) {
             if (evt.getSpawner() != null && evt.getSpawner().getSpawnerBlockEntity() != null) {
-                BlockEntity be = evt.getSpawner().getSpawnerBlockEntity();
                 BlockPos bp = evt.getSpawner().getSpawnerBlockEntity().getBlockPos();
-                if (BuildingUtils.findBuilding(false, bp).getBuilding() instanceof Dungeon ||
-                    BuildingUtils.findBuilding(false, bp).getBuilding() instanceof FlameSanctuary) {
+                BuildingPlacement bpl = BuildingUtils.findBuilding(false, bp);
+                if (bpl != null &&
+                   (bpl.getBuilding() instanceof Dungeon ||
+                    bpl.getBuilding() instanceof FlameSanctuary)) {
                     evt.getEntity().discard();
                 }
             }

src/main/java/com/solegendary/reignofnether/building/buildings/monsters/Dungeon.java

@@ -47,7 +47,7 @@ public Dungeon() {
 
         this.explodeChance = 0.2f;
         this.productions.add(ProductionItems.CREEPER, Keybindings.keyQ);
-        this.productions.add(ProductionItems.WRAITH, Keybindings.keyW);
+        //this.productions.add(ProductionItems.WRAITH, Keybindings.keyW);
     }
 
     public Faction getFaction() {return Faction.MONSTERS;}

src/main/java/com/solegendary/reignofnether/building/buildings/monsters/Graveyard.java

@@ -46,16 +46,16 @@ public Graveyard() {
 
         this.explodeChance = 0.2f;
 
-        this.abilities.add(new SetGraveyardReleaseOff(), Keybindings.keyO);
-        this.abilities.add(new SetGraveyardReleaseOn(), Keybindings.keyO);
+        //this.abilities.add(new SetGraveyardReleaseOff(), Keybindings.keyO);
+        //this.abilities.add(new SetGraveyardReleaseOn(), Keybindings.keyO);
 
         this.productions.add(ProductionItems.ZOMBIE, Keybindings.keyQ);
         this.productions.add(ProductionItems.HUSK, Keybindings.keyQ);
         this.productions.add(ProductionItems.DROWNED, Keybindings.keyW);
         this.productions.add(ProductionItems.SKELETON, Keybindings.keyE);
         this.productions.add(ProductionItems.STRAY, Keybindings.keyE);
         this.productions.add(ProductionItems.BOGGED, Keybindings.keyR);
-        this.productions.add(ProductionItems.RESEARCH_OVERFLOWING_GRAVEYARD, Keybindings.keyT);
+        //this.productions.add(ProductionItems.RESEARCH_OVERFLOWING_GRAVEYARD, Keybindings.keyT);
     }
 
     @Override