mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
85 lines
3.6 KiB
Diff
85 lines
3.6 KiB
Diff
From 6b3959cb0a2d244edd7ed730e56b3b5a26fdefaa Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Fri, 23 Aug 2019 21:56:31 -0500
|
|
Subject: [PATCH] Option for slimes not pushable
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/BlockPiston.java | 12 ++++++++++++
|
|
src/main/java/net/minecraft/server/BlockSlime.java | 7 +++++++
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 13 +++++++++++++
|
|
3 files changed, 32 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
|
|
index de804348f..52cc35d0a 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockPiston.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
|
|
@@ -9,6 +9,8 @@ import java.util.Set;
|
|
// CraftBukkit start
|
|
import com.google.common.collect.ImmutableList;
|
|
import java.util.AbstractList;
|
|
+
|
|
+import org.bukkit.Material;
|
|
import org.bukkit.craftbukkit.block.CraftBlock;
|
|
import org.bukkit.event.block.BlockPistonRetractEvent;
|
|
import org.bukkit.event.block.BlockPistonExtendEvent;
|
|
@@ -329,6 +331,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() == 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 fd54958f6..3ee8332c9 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 47bb0fb95..1d043e53a 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -283,6 +283,19 @@ public class PurpurConfig {
|
|
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
|
|
}
|
|
|
|
+ public static boolean slimeBlocksNotPushable = false;
|
|
+ private static void slimeBlocksNotPushable() {
|
|
+ if (version < 2) {
|
|
+ if (config.isSet("slimes-not-pushable")) {
|
|
+ slimeBlocksNotPushable = config.getBoolean("slimes-not-pushable", slimeBlocksNotPushable);
|
|
+ }
|
|
+ if (config.isSet("settings.slimes-not-pushable")) {
|
|
+ slimeBlocksNotPushable = config.getBoolean("settings.slimes-not-pushable", slimeBlocksNotPushable);
|
|
+ }
|
|
+ }
|
|
+ slimeBlocksNotPushable = getBoolean("settings.slime-blocks-not-pushable", slimeBlocksNotPushable);
|
|
+ }
|
|
+
|
|
public static boolean ridableBat = true;
|
|
public static boolean ridableBlaze = true;
|
|
public static boolean ridableCat = true;
|
|
--
|
|
2.23.0.rc1
|
|
|