mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appear to apply and compile correctly Paper Changes: a70924789 [Auto] Updated Upstream (CraftBukkit) Tuinity Changes: d1db107 Updated Upstream (Paper)
This commit is contained in:
@@ -67,10 +67,10 @@ index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc572
|
||||
public Scoreboard getScoreboard() {
|
||||
return getBukkitEntity().getScoreboard().getHandle();
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 3a1016e345282eab9408c9caa294e7b7e01482f9..b59e82d8ca3132f448aba892741585406cdc023e 100644
|
||||
index d27124959e4527cc7bfa1b38b8d9f5c56894a617..ed86e0b82682ae445c2430115e39588c0a77028d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1656,6 +1656,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
@@ -1686,6 +1686,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
|
||||
// Paper start
|
||||
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
|
||||
|
||||
Reference in New Issue
Block a user