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

Move more options to per-world section (still more to come)

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-14 19:33:01 -06:00
parent bee0cc833b
commit a221240eef
35 changed files with 298 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0054-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From be230534a636a8e41534507f33e443d993ee09ad Mon Sep 17 00:00:00 2001
From 34a74b47613d54bec307dd0792344914f9081b11 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Option for slimes not pushable
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 b29525c40..3a47df79f 100644
index b29525c40d..3a47df79f3 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -10,6 +10,8 @@ import java.util.Map.Entry;
@@ -40,7 +40,7 @@ index b29525c40..3a47df79f 100644
if (event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
index 01f32659d..52ab86f0b 100644
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 {
@@ -56,10 +56,10 @@ index 01f32659d..52ab86f0b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9465fc13e..fc0c8f2f4 100644
index 4f6ec93991..a511c83cca 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 {
@@ -245,6 +245,19 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}
@@ -80,5 +80,5 @@ index 9465fc13e..fc0c8f2f4 100644
public static boolean ridableBee = true;
public static boolean ridableBlaze = true;
--
2.24.0.rc1
2.24.0