mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-19 14:59:29 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@743346a5 Force update attributes PaperMC/Paper@1a7288aa Adjust unloaded chunk check for block digging
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.
|
functionality before additional exploits are found.
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index 727792ca1a2c9044abb1d404fbf8420652e1507c..cc7d0dde2ec7b0cc1656295291eba95e6fa0d70f 100644
|
index 1205307b7d2336fa6c5395a65be6643228c49d72..bac7225ea6095a746a71d5be2ba4bf147971827b 100644
|
||||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -1170,6 +1170,11 @@ public class ServerGamePacketListenerImpl
|
@@ -1171,6 +1171,11 @@ public class ServerGamePacketListenerImpl
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handleEditBook(ServerboundEditBookPacket packet) {
|
public void handleEditBook(ServerboundEditBookPacket packet) {
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ index dff1e84584c66045c58f0a6fe8102a27a54716a6..6efb636b0a4443daa4861d35116905d5
|
|||||||
public boolean isRealPlayer; // Paper
|
public boolean isRealPlayer; // Paper
|
||||||
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
|
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
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index cc7d0dde2ec7b0cc1656295291eba95e6fa0d70f..fc77b81dd87162129742963ea633b19250062b2c 100644
|
index bac7225ea6095a746a71d5be2ba4bf147971827b..aab9786db66740d281cf0be3ad921ccdfbc8c27e 100644
|
||||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -2334,7 +2334,7 @@ public class ServerGamePacketListenerImpl
|
@@ -2342,7 +2342,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
|
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
|
} 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));
|
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|||||||
Gale - https://galemc.org
|
Gale - https://galemc.org
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index fc77b81dd87162129742963ea633b19250062b2c..df6f3fb2d2f9b51afbfff8ec41d286cb7d0cde84 100644
|
index aab9786db66740d281cf0be3ad921ccdfbc8c27e..52cb71a46161fd8b910b4b9afde2cb489c3a3c8b 100644
|
||||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -2488,7 +2488,7 @@ public class ServerGamePacketListenerImpl
|
@@ -2496,7 +2496,7 @@ public class ServerGamePacketListenerImpl
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
String rawMessage = message.signedContent();
|
String rawMessage = message.signedContent();
|
||||||
if (rawMessage.isEmpty()) {
|
if (rawMessage.isEmpty()) {
|
||||||
|
|||||||
@@ -192,10 +192,10 @@ index acb1168aba0069f9ac7f47d96f0f4945b37c3888..148be9d5e10d7a770814a10dc40bfb70
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index df6f3fb2d2f9b51afbfff8ec41d286cb7d0cde84..32bee1b855766d02905aca495db065f015e37385 100644
|
index 52cb71a46161fd8b910b4b9afde2cb489c3a3c8b..d2b3f0a45c70f06fa7ff5c291cf3f79e9b264a09 100644
|
||||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -2776,7 +2776,7 @@ public class ServerGamePacketListenerImpl
|
@@ -2784,7 +2784,7 @@ public class ServerGamePacketListenerImpl
|
||||||
target.refreshEntityData(ServerGamePacketListenerImpl.this.player);
|
target.refreshEntityData(ServerGamePacketListenerImpl.this.player);
|
||||||
// SPIGOT-7136 - Allays
|
// SPIGOT-7136 - Allays
|
||||||
if (target instanceof Allay || target instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync
|
if (target instanceof Allay || target instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ group=org.galemc.gale
|
|||||||
version=1.21.4-R0.1-SNAPSHOT
|
version=1.21.4-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion=1.21.4
|
mcVersion=1.21.4
|
||||||
paperRef=e5d988df858e24fc94a5a5ccd91e382e7f404724
|
paperRef=1a7288aa05cfb0a168850a7cc879f55235fe5934
|
||||||
|
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
|
|||||||
Reference in New Issue
Block a user