Update to 1.15

2026-02-20 09:57:43 +01:00 · 2019-12-13 15:11:37 -06:00
parent af7f8f2bb5
commit 18ebfc0366
88 changed files with 1038 additions and 1068 deletions
--- a/patches/server/0055-Option-for-slimes-not-pushable.patch
+++ b/patches/server/0055-Option-for-slimes-not-pushable.patch
@@ -1,84 +0,0 @@
-From 5b63c689aa1542e570b8d4e8ad03059fbd67d043 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 de804348f3..52cc35d0a7 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 fd54958f65..3ee8332c95 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 e6a8f9fb84..94ca1e0bcb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -278,6 +278,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.24.0.rc1
-