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

@@ -106,10 +106,10 @@ index 9af2bb392..28808712e 100644
this.move(EnumMoveType.SELF, this.getMot());
if (!this.onGround) {
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 652ee3d3d..ed667f727 100644
index a2924ab61..a295968ed 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -990,6 +990,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -991,6 +991,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (this.isInvulnerable(damagesource)) {
return false;
} else {