Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7358bf02 [Auto] Updated Upstream (CraftBukkit/Spigot)
8df6e39b [CI-SKIP] Fix version for groovy artifact (1.16.4) (#4730)
0e73fdbf OBFHELPERS (#4733)
This commit is contained in:
William Blake Galbreath
2020-11-04 13:08:22 -06:00
parent f15d3f0497
commit f0b8bd76a6
11 changed files with 43 additions and 43 deletions

View File

@@ -161,7 +161,7 @@ index bd0267ee4b..8b36ac2b09 100644
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 932d694cc4..1d4078f5a1 100644
index 7635e25422..7c201dd17d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -4939,10 +4939,10 @@ index 0000000000..44929182df
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2392c9779b..88f6f2afcf 100644
index 9d6ef83ef5..d47902ac6c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2231,6 +2231,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2232,6 +2232,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.server.getPluginManager().callEvent(event);