Merge pull request #597 from fixrtm/signal-converter-not-loaded

fix: null pointer exception on loading block

Author: anatawa12

CHANGELOG-SNAPSHOTS.md

@@ -19,6 +19,7 @@ The changelog for 2.0.23 and earlier is generated by [anatawa12's fork of `auto-
 
 ### Fixed
 - Formation is broken when we disconnected long formation `#596`
+- Signal Converter Setting is not loaded correctly `#597`
 
 ### Security
 

CHANGELOG.md

@@ -26,6 +26,7 @@ Thanks to prepare-changelog.sh, we have some macros.
 
 ### Fixed
 - Formation is broken when we disconnected long formation `#596`
+- Signal Converter Setting is not loaded correctly `#597`
 
 ### Security
 

src/main/ngtlib-patches/jp/ngt/ngtlib/block/TileEntityCustom.java.patch

@@ -18,13 +18,15 @@
 
     public NBTTagCompound getUpdateTag() {
        return this.writeToNBT(new NBTTagCompound());
-@@ -50,11 +43,12 @@
+@@ -49,12 +42,13 @@
+    public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) {
        this.readFromNBT(pkt.getNbtCompound());
     }
 
     protected void sendPacket() {
-       if (this.world == null || !this.world.isRemote) {
+-      if (this.world == null || !this.world.isRemote) {
 -         PacketNBT.sendToClient(this);
++      if (this.world != null && !this.world.isRemote) {
 +         net.minecraft.block.state.IBlockState state = getWorld().getBlockState(getPos());
 +         getWorld().notifyBlockUpdate(getPos(), state, state, 0);
        }