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

@@ -3189,10 +3189,10 @@ index a3a428da9..cf7de0127 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index cf7739164..47f881d74 100644
index c669141d2..526af292f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -505,6 +505,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -506,6 +506,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
this.advancementDataPlayer.b(this);
@@ -4939,10 +4939,10 @@ index 000000000..44929182d
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a1eaf7bcb..69a612b35 100644
index 042c77286..bba520053 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2232,6 +2232,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2233,6 +2233,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.server.getPluginManager().callEvent(event);
@@ -4992,7 +4992,7 @@ index 5af554870..c59305ef7 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 10a2d2a20..64824e708 100644
index 96d9c81c0..968e0c052 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1648,5 +1648,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {