Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2f0e0a6d Backport feature search improvement from 1.17 (Fixes #2312) (#4771)
b6d9d634 Add API for quit reason
This commit is contained in:
BillyGalbreath
2020-11-14 19:06:39 -06:00
parent be5fcdd8d7
commit 519ac08d10
17 changed files with 69 additions and 69 deletions

View File

@@ -131,10 +131,10 @@ index 1c682a62b..f7b92078e 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 287a496ee..9159601da 100644
index 36168d0f7..18e264a1b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1944,8 +1944,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1945,8 +1945,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@Override