From 5f6185e24488dc16df1aec88bf4d5c461cbd4b24 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 21:56:31 -0500 Subject: [PATCH] Option for slimes not pushable --- src/main/java/net/minecraft/server/BlockPiston.java | 10 ++++++++++ src/main/java/net/minecraft/server/BlockSlime.java | 7 +++++++ src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java index b29525c40d..1e72b3bbc5 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -332,6 +332,16 @@ public class BlockPiston extends BlockDirectional { } else { event = new BlockPistonRetractEvent(bblock, blocks, CraftBlock.notchToBlockFace(enumdirection1)); } + // Purpur start + if (net.pl3x.purpur.PurpurConfig.slimeBlocksNotPushable) { + for (org.bukkit.block.Block block : blocks) { + if (block.getType() == org.bukkit.Material.SLIME_BLOCK) { + event.setCancelled(true); + break; + } + } + } + // Purpur end world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java index 01f32659d9..52ab86f0b1 100644 --- a/src/main/java/net/minecraft/server/BlockSlime.java +++ b/src/main/java/net/minecraft/server/BlockSlime.java @@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent { super.stepOn(world, blockposition, entity); } + + // Purpur start + @Override + public EnumPistonReaction getPushReaction(IBlockData iblockdata) { + return net.pl3x.purpur.PurpurConfig.slimeBlocksNotPushable ? EnumPistonReaction.BLOCK : super.getPushReaction(iblockdata); + } + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 2537a5add3..7be2e01814 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,11 @@ public class PurpurConfig { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); } + public static boolean slimeBlocksNotPushable = false; + private static void blockSettings() { + slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable); + } + private static void timingsSettings() { getString("settings.timings.url", "https://timings.pl3x.net"); } -- 2.24.0