mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2026-01-04 15:31:45 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3d13b115 fix: switch back to using a snapshot for velocity-natives PaperMC/Paper@7afae7f4 Add client tick end event (#12199) PaperMC/Paper@e5d988df Revert "Fix cancelling PlayerInteractEvent at (0, 0, 0) (#12215)"
This commit is contained in:
@@ -22,10 +22,10 @@ you to easily disable books, should you want to preemptively remove this
|
||||
functionality before additional exploits are found.
|
||||
|
||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 5738709f5fa6fee2ed88ba41a7718c976b780e96..6dd3de8544c9d62bc3af1bef535a11b9878d1b75 100644
|
||||
index 727792ca1a2c9044abb1d404fbf8420652e1507c..cc7d0dde2ec7b0cc1656295291eba95e6fa0d70f 100644
|
||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -1168,6 +1168,11 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -1170,6 +1170,11 @@ public class ServerGamePacketListenerImpl
|
||||
|
||||
@Override
|
||||
public void handleEditBook(ServerboundEditBookPacket packet) {
|
||||
|
||||
@@ -25,10 +25,10 @@ index dff1e84584c66045c58f0a6fe8102a27a54716a6..6efb636b0a4443daa4861d35116905d5
|
||||
public boolean isRealPlayer; // Paper
|
||||
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
|
||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 6dd3de8544c9d62bc3af1bef535a11b9878d1b75..f4708bd41f4036faf48e3916ec5675ec43eff394 100644
|
||||
index cc7d0dde2ec7b0cc1656295291eba95e6fa0d70f..fc77b81dd87162129742963ea633b19250062b2c 100644
|
||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2332,7 +2332,7 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -2334,7 +2334,7 @@ public class ServerGamePacketListenerImpl
|
||||
this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect
|
||||
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
|
||||
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
|
||||
@@ -38,7 +38,7 @@ index 6dd3de8544c9d62bc3af1bef535a11b9878d1b75..f4708bd41f4036faf48e3916ec5675ec
|
||||
// CraftBukkit start
|
||||
if (sync) {
|
||||
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
|
||||
index fad7f9a80ad79e377d76d1c3a054300183f4a5b6..9b17f42afc0e3e3629382c000d7a4414053783f3 100644
|
||||
index 1fd2c7988ebb276a8ee68455d0090e7acd473ba7..22a083de59e429aca7e7f647cae7b54735efb9a1 100644
|
||||
--- a/net/minecraft/server/players/PlayerList.java
|
||||
+++ b/net/minecraft/server/players/PlayerList.java
|
||||
@@ -330,6 +330,8 @@ public abstract class PlayerList {
|
||||
|
||||
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index f4708bd41f4036faf48e3916ec5675ec43eff394..b56b41e696adc5f2485439676402e6084265aedd 100644
|
||||
index fc77b81dd87162129742963ea633b19250062b2c..df6f3fb2d2f9b51afbfff8ec41d286cb7d0cde84 100644
|
||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2486,7 +2486,7 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -2488,7 +2488,7 @@ public class ServerGamePacketListenerImpl
|
||||
// CraftBukkit start
|
||||
String rawMessage = message.signedContent();
|
||||
if (rawMessage.isEmpty()) {
|
||||
|
||||
@@ -179,7 +179,7 @@ index 68727deaedd55aa86e76fbc6cc2cfb67913f7add..bad5787de2034dbb0eabb9458a47a89e
|
||||
private static final Codec<Object> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, ComponentSerialization.CODEC)
|
||||
.xmap(
|
||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||
index 6c486f1c04c9fed6e3a07e4d9aa1e79f8fdd7015..c697576d3ae22fbb7ae869fa099bffc8ac5cb2e5 100644
|
||||
index acb1168aba0069f9ac7f47d96f0f4945b37c3888..148be9d5e10d7a770814a10dc40bfb70b71d4021 100644
|
||||
--- a/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -1224,7 +1224,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||
@@ -192,10 +192,10 @@ index 6c486f1c04c9fed6e3a07e4d9aa1e79f8fdd7015..c697576d3ae22fbb7ae869fa099bffc8
|
||||
return ret;
|
||||
}
|
||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 2b035f3f62016ae2de052755b8e10846cbf1afc7..657fbc5e5d81b44fefc2d9d6c6bfe47f179a7843 100644
|
||||
index df6f3fb2d2f9b51afbfff8ec41d286cb7d0cde84..32bee1b855766d02905aca495db065f015e37385 100644
|
||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2774,7 +2774,7 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -2776,7 +2776,7 @@ public class ServerGamePacketListenerImpl
|
||||
target.refreshEntityData(ServerGamePacketListenerImpl.this.player);
|
||||
// SPIGOT-7136 - Allays
|
||||
if (target instanceof Allay || target instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync
|
||||
|
||||
Reference in New Issue
Block a user