Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
dccaf59a MC-197883: Bandaid decode issue
99a1e58f Merge branch 'master' into progress/1.16.2
7470c3ef Do not let the server load chunks from newer versions (1.16.2+)
ecbc5ca0 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-08-21 20:23:12 -05:00
parent 5630d9a693
commit 1af3ae4877
7 changed files with 22 additions and 22 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index 8d9ab06c8..0f51dbf8d 100644
index b5191eb0b..cde5c46fe 100644
--- a/src/main/java/net/minecraft/server/EntityDolphin.java
+++ b/src/main/java/net/minecraft/server/EntityDolphin.java
@@ -328,6 +328,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -329,6 +329,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@Override
public boolean a() {