mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6f5e6c6 Use setMessage instead of arraycopy
This commit is contained in:
@@ -82,7 +82,7 @@ index 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734b
|
||||
public Scoreboard getScoreboard() {
|
||||
return this.getBukkitEntity().getScoreboard().getHandle();
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 4cfa7f9480339d1d3e3e024c6afe258dfcec31ea..3518e5748e6f380eb53abc29a9483f58278c44ec 100644
|
||||
index 1d61e34b1cc032089dbd715814553e59ebc8ce5c..763874b78363d75f8c386cff3cf48c93920957d1 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -1983,12 +1983,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -121,10 +121,10 @@ index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43
|
||||
return entityplayer1;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 75a38684e790a1d551d0b694a0b2aa8545a10f74..d5c3f212b78fcd453ec268a2f85bc7e8e2de1a56 100644
|
||||
index e9c3768ef277fc88db4d5660e241ec7ef8e770c4..4f007dce3f4f7cf19d8e38b46435c762813c6c43 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2815,5 +2815,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2817,5 +2817,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void resetIdleTimer() {
|
||||
getHandle().resetLastActionTime();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user