mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172) PaperMC/Paper@5deafd1 Teleportation API (#6562)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Add log suppression for sent expired chat
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 5868d67e0bc5a8f75b6719d727abac6f83a1513a..35b7e40810dce7fcde0e750df8ab8b6f8285c4e3 100644
|
||||
index d1f238e2803ab080b7db1d01b399939e8c134c73..f15d956c727c9d356f1d616aee34121690944807 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2248,7 +2248,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -2254,7 +2254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
}); // Paper - push to main
|
||||
return false;
|
||||
} else {
|
||||
@@ -18,7 +18,7 @@ index 5868d67e0bc5a8f75b6719d727abac6f83a1513a..35b7e40810dce7fcde0e750df8ab8b6f
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
index 72019819584bf7b48c7cdcbba569c0f7a9d1bfb2..093e994f7f7e78c5bb2e38324ff89e231e1da8ee 100644
|
||||
index 8caf0861433263086dbae6f13b5fa6a36de68843..d0b4ea0212b6a5ccba029c124be1ca3ffafd5d26 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
@@ -431,11 +431,13 @@ public class PurpurConfig {
|
||||
|
||||
Reference in New Issue
Block a user