mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4f9575e Break redstone on top of trap doors early PaperMC/Paper@83da4b6 Fix DamageSource for Falling Blocks (#9175) PaperMC/Paper@9846d0d Fix some NPE for EntityCompostItemEvent (#9169) PaperMC/Paper@813d039 Make sure the player didn't disconnect when processing commands PaperMC/Paper@1d4c780 Fix BlockPosition#offset(double,double,double) (#9190)
This commit is contained in:
@@ -48,10 +48,10 @@ index 2bd58d13d4c48fdddee56e2b417b68fe15072386..beb05039926e1fb7a656dfcd0c503f82
|
||||
while (iterator.hasNext()) {
|
||||
ServerLevel worldserver = (ServerLevel) iterator.next();
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 297bc331795c0b53b4662549fe4a2b7b11979bfe..7254d62f3713113027eba29853e9d975eab15f7f 100644
|
||||
index 08f0ca65246ad2d4057bb6bab9b16d19e4d6a7e6..5f868d5ea8c3b42fa3e6f519122c751cee89d8f2 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -3447,6 +3447,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||
@@ -3448,6 +3448,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ index 297bc331795c0b53b4662549fe4a2b7b11979bfe..7254d62f3713113027eba29853e9d975
|
||||
boolean flag1 = packet.getSlotNum() >= 1 && packet.getSlotNum() <= 45;
|
||||
boolean flag2 = itemstack.isEmpty() || itemstack.getDamageValue() >= 0 && itemstack.getCount() <= 64 && !itemstack.isEmpty();
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
index ebfd0b9c713df5074ac47b2cb94cee356b4e3f4b..797afa6e73992fc3dad1720494c089730e5deaba 100644
|
||||
index 82cf79cffbc961dc1db43a4afc6eb1efb5bfe297..e6f058019f7ebbc900fab35b576685c586abe408 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
@@ -547,4 +547,9 @@ public class PurpurConfig {
|
||||
|
||||
Reference in New Issue
Block a user