Patches 100-260 (#2729)

This commit is contained in:
MiniDigger | Martin
2019-12-12 00:43:22 +01:00
parent 2dc2fcce09
commit c9ef3d1cfc
159 changed files with 639 additions and 954 deletions

View File

@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
whatever
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 063ba6a1d..aacce432b 100644
index 671587631..e315a00cc 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 063ba6a1d..aacce432b 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index f8fa64959..735d1879a 100644
index 8c4f3b2c2..1c1ff2069 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -0,0 +0,0 @@ public class EntitySquid extends EntityWaterAnimal {