diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java index 60ffe7b..32e76cd 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java @@ -26,13 +26,20 @@ public NetherGeyserPolymer(Identifier blockId) { public BlockState getPolymerBlockState(BlockState state) { return PolyUtil.SMALL_BLOCK; } + @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context == null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context == null) { + return Blocks.NETHERRACK.getDefaultState(); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.NETHERRACK.getDefaultState(); } @@ -42,6 +49,11 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext } @Override - public boolean canSyncRawToClient(PacketContext context) {return hasModOnClient(context.getPlayer());} + public boolean canSyncRawToClient(PacketContext context) { + if (context == null) { + return false; + } + return hasModOnClient(context.getPlayer()); + } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java index 13d86f7..2928caa 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java @@ -28,11 +28,17 @@ public BlockState getPolymerBlockState(BlockState state) { } @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context==null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context == null) { + return Blocks.SNOW.getDefaultState(); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.SNOW.getDefaultState(); } @@ -43,6 +49,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext @Override public boolean canSyncRawToClient(PacketContext context) { + if (context == null) { + return false; + } return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java index 5ee2c6e..8d1f5fd 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java @@ -30,11 +30,17 @@ public BlockState getPolymerBlockState(BlockState state) { } @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context==null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context==null) { + return Blocks.SPRUCE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.SPRUCE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); } @@ -45,6 +51,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext @Override public boolean canSyncRawToClient(PacketContext context) { + if (context == null) { + return false; + } return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java index d2e2c88..7861d10 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java @@ -30,11 +30,17 @@ public BlockState getPolymerBlockState(BlockState state) { } @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context==null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context==null) { + return Blocks.STONE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.STONE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); } @@ -45,6 +51,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext @Override public boolean canSyncRawToClient(PacketContext context) { + if (context == null) { + return false; + } return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java index 46908bd..fb1b171 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java @@ -29,11 +29,17 @@ public BlockState getPolymerBlockState(BlockState state) { } @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context==null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context==null) { + return Blocks.WHITE_CANDLE.getDefaultState(); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.WHITE_CANDLE.getDefaultState(); } @@ -44,6 +50,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext @Override public boolean canSyncRawToClient(PacketContext context) { + if (context == null) { + return false; + } return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java index a9ccc76..318b5f9 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java @@ -29,11 +29,17 @@ public BlockState getPolymerBlockState(BlockState state) { } @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context==null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context==null) { + return Blocks.SEA_PICKLE.getDefaultState(); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.SEA_PICKLE.getDefaultState(); } @@ -44,6 +50,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext @Override public boolean canSyncRawToClient(PacketContext context) { + if (context == null) { + return false; + } return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java index 4f69265..e63e18d 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java @@ -30,11 +30,17 @@ public BlockState getPolymerBlockState(BlockState state) { } @Override public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + if (context==null) { + return getPolymerBlockState(state); + } return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + if (context==null) { + return Blocks.OAK_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); + } return hasModOnClient(context.getPlayer()) ? state : Blocks.OAK_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); } @@ -45,6 +51,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext @Override public boolean canSyncRawToClient(PacketContext context) { + if (context==null) { + return false; + } return hasModOnClient(context.getPlayer()); } }