Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
14513c3c Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2019-09-13 10:27:33 -05:00
parent c349c48fb0
commit 394c0f02f8
58 changed files with 114 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
patches/server/0057-Option-for-slimes-not-pushable.patch Normal file
View File

@@ -0,0 +1,49 @@
From 1af46e167d7e6118cf4f13aaa95bf7a5064af5fc 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/BlockSlime.java | 5 +++++
src/main/java/net/pl3x/purpur/PurpurConfig.java | 11 +++++++++++
2 files changed, 16 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
index fd54958f6..0f4cdd5ed 100644
--- a/src/main/java/net/minecraft/server/BlockSlime.java
+++ b/src/main/java/net/minecraft/server/BlockSlime.java
@@ -49,4 +49,9 @@ public class BlockSlime extends BlockHalfTransparent {
super.stepOn(world, blockposition, entity);
}
+
+ @Override
+ public EnumPistonReaction getPushReaction(IBlockData iblockdata) {
+ return net.pl3x.purpur.PurpurConfig.slimeBlocksNotPushable ? EnumPistonReaction.BLOCK : super.getPushReaction(iblockdata);
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c548af4bf..868271fa1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -286,6 +286,17 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}
+ public static boolean slimeBlocksNotPushable = false;
+ private static void slimeBlocksNotPushable() {
+ if (version < 2) {
+ boolean oldValue = config.getBoolean("slimes-not-pushable", slimeBlocksNotPushable);
+ oldValue = config.getBoolean("settings.slimes-not-pushable", oldValue);
+
+ set("settings.slime-blocks-not-pushable", oldValue);
+ }
+ 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