mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ebaca20 Added getHostname to AsyncPlayerPreLoginEvent (#6656) PaperMC/Paper@0c64d40 Updated Upstream (Bukkit/CraftBukkit) (#7323) PaperMC/Paper@6663747 Some block state hunks were in the wrong patch (#7308) PaperMC/Paper@78999b5 Remove redundant getRemoteAddress that can cause an NPE (#7331)
This commit is contained in:
@@ -43,10 +43,10 @@ index 889a4804eaa128e2f79a4ea48b8aa796336576d1..f020ec3974c9d8de8afd42bb33065350
|
||||
try {
|
||||
byte[] data = new byte[packet.data.readableBytes()];
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 8de4ad9f2120d22b78202981624abd1d2fc70148..48fc8c707ffee15fcbfbb23c59cdb492d57ad707 100644
|
||||
index 148e1985017f6955267b5c970730645394d700f6..c5e3dfd91aba27d9b0115d264a3bbf3d50066356 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2609,4 +2609,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2623,4 +2623,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
return this.spigot;
|
||||
}
|
||||
// Spigot end
|
||||
|
||||
Reference in New Issue
Block a user