Replace all references of blockType with getBlockType to fix NPE down…

…stream
GTNewHorizons · Oct 24, 2023 · 0da29db · 0da29db
1 parent f54c697
commit 0da29db
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCKeyStone.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCKeyStone.java
@@ -181,6 +181,6 @@ public void readFromNBT(NBTTagCompound compound) {
 
     public void updateBlocks() {
         worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
+        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
     }
 }
diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetector.java
@@ -63,13 +63,13 @@ public void setRange(int value) {
 
     private void updateBlocks() {
         worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
+        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
         for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) {
             worldObj.notifyBlocksOfNeighborChange(
                     xCoord + direction.offsetX,
                     yCoord + direction.offsetY,
                     zCoord + direction.offsetZ,
-                    blockType,
+                    getBlockType(),
                     direction.getOpposite().ordinal());
         }
     }

diff --git a/...ava/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java b/...ava/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java
@@ -96,13 +96,13 @@ public void setShouldOutput(boolean shouldOutputSignal) {
 
     private void updateBlocks() {
         worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
+        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
         for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) {
             worldObj.notifyBlocksOfNeighborChange(
                     xCoord + direction.offsetX,
                     yCoord + direction.offsetY,
                     zCoord + direction.offsetZ,
-                    blockType,
+                    getBlockType(),
                     direction.getOpposite().ordinal());
         }
     }

diff --git a/...n3055/draconicevolution/common/tileentities/multiblocktiles/TileDislocatorReceptacle.java b/...n3055/draconicevolution/common/tileentities/multiblocktiles/TileDislocatorReceptacle.java
@@ -60,7 +60,7 @@ public void updateState() {
         }
         if (structure == null) {
             isActive = false;
-            worldObj.notifyBlockChange(xCoord, yCoord, zCoord, blockType);
+            worldObj.notifyBlockChange(xCoord, yCoord, zCoord, getBlockType());
             worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
             return;
         }
@@ -80,7 +80,7 @@ public void updateState() {
             }
         }
         if (isActive != isActiveBeforeUpdate) {
-            worldObj.notifyBlockChange(xCoord, yCoord, zCoord, blockType);
+            worldObj.notifyBlockChange(xCoord, yCoord, zCoord, getBlockType());
             worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
         }
     }

diff --git a/...om/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java b/...om/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java
@@ -65,7 +65,7 @@ public void updateEntity() {
         if (tick % 20 == 0) {
             int comparatorOut = (int) (getEnergyStored() / getMaxEnergyStored() * 15D);
             if (comparatorOut != lastCheckCompOverride) {
-                worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
+                worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
                 lastCheckCompOverride = comparatorOut;
             }
         }

diff --git a/...conicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java b/...conicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java
@@ -46,7 +46,7 @@ public void updateEntity() {
             int comparatorOutput = core.getComparatorOutput(comparatorMode);
             if (comparatorOutput != comparatorOutputCache) {
                 comparatorOutputCache = comparatorOutput;
-                worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
+                worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
             }
         }
     }

diff --git a/.../draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java b/.../draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java
@@ -64,7 +64,7 @@ public void updateEntity() {
             int comparatorOutput = core.getComparatorOutput(comparatorMode);
             if (comparatorOutput != comparatorOutputCache) {
                 comparatorOutputCache = comparatorOutput;
-                worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
+                worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
             }
         }
     }