Update to 1.15

This commit is contained in:
William Blake Galbreath
2019-12-13 15:11:37 -06:00
parent af7f8f2bb5
commit 18ebfc0366
88 changed files with 1038 additions and 1068 deletions

View File

@@ -1,4 +1,4 @@
From 06f097bcd196eca3dcf038a48b02364328cd0e65 Mon Sep 17 00:00:00 2001
From 9e203340843bfb499a69eabf211866d002b0d77f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add config for items breaking turtle eggs
@@ -9,10 +9,10 @@ Subject: [PATCH] Add config for items breaking turtle eggs
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index 0118a8451..83e69425b 100644
index cb36334e41..238d260b5f 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -163,6 +163,17 @@ public class BlockTurtleEgg extends Block {
@@ -157,6 +157,17 @@ public class BlockTurtleEgg extends Block {
}
private boolean a(World world, Entity entity) {
@@ -32,7 +32,7 @@ index 0118a8451..83e69425b 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index abd10a500..5c5a729e9 100644
index abd10a500a..5c5a729e9e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,4 +103,9 @@ public class PurpurWorldConfig {
@@ -46,5 +46,5 @@ index abd10a500..5c5a729e9 100644
+ }
}
--
2.23.0.rc1
2.24.0.rc1