Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
81a537c1f Add PlayerKickEvent causes (#5648)
b7976b956 Add More Lidded Block API (#5707)
This commit is contained in:
BillyGalbreath
2021-05-26 07:04:11 -05:00
parent 2aacc76669
commit 9fec1bae8c
26 changed files with 85 additions and 85 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cbc6d074a7366f6456c6af2a3fedf0f7bd40cb5b..8ba25be0ea59483e824be9afc63d47cb75b5b334 100644
index f0d997678a94b85cf0568c7fc28d45adc0a0eb87..8769e22fcfef5dd9a76e0a9904e7f2738cdd5a5f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1543,6 +1543,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -116,10 +116,10 @@ index ed80429706bb81c0dfaa36f8c60983dc2e16d0d7..de31df7d621ca255ff17c4267bccaf34
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index e6d73912a333edd43c4e489c50f4e441c3b2cc29..e35a23544112aa11506951f2a609a5df54cf83a3 100644
index 10c5af3949af4a3bee4999753e7545f0ac745e63..764ec67150a37f3a18eb1efde9d0c8810a92da6d 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2473,6 +2473,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2481,6 +2481,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.server.getPluginManager().callEvent(event);