AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-07-05 03:16:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper

Browse Source
This commit is contained in:
Telesphoreo
2023-04-13 18:31:29 -05:00
parent db22a6b194
commit da48bc9763
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0037-Add-Scissors-configuration-file-command.patch
View File

@ -486,7 +486,7 @@ index a7e133f3495e9132a5fdae2c24f225e7b026295a..16f0daad2456ce23f8d73389f62aac9f
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 10a4806e2b65b99b3a3a9091829bb029ce7cee2b..c5902b6bc9cbd8d95688047f0cb84b4e2cfa4e43 100644
index ef21a5eed89f9a4883a19ade4093bbb7a3b5b594..a6ec29e95d147bdc9273a2144d3a2d9ce75f2e56 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1,5 +1,6 @@
@ -496,7 +496,7 @@ index 10a4806e2b65b99b3a3a9091829bb029ce7cee2b..c5902b6bc9cbd8d95688047f0cb84b4e
import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
import com.google.common.collect.Lists;
import com.google.common.primitives.Floats;
@@ -2369,6 +2370,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2370,6 +2371,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
Optional<LastSeenMessages> optional = this.lastSeenMessages.applyUpdate(acknowledgment);
if (optional.isEmpty()) {
@ -509,7 +509,7 @@ index 10a4806e2b65b99b3a3a9091829bb029ce7cee2b..c5902b6bc9cbd8d95688047f0cb84b4e
ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
}
@@ -2601,11 +2608,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2602,11 +2609,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleChatAck(ServerboundChatAckPacket packet) {
LastSeenMessagesValidator lastseenmessagesvalidator = this.lastSeenMessages;
@ -663,7 +663,7 @@ index 4da4edae517a0efec6e03a719ec47b700509dab1..837b20be528bc33f62c0c675d90afebd
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c714eb04b9ca520e83a704a4c5464cafe9bd9447..47406504e3b5f4ef8a3c5549b40e2ae808d121fd 100644
index a6877783bcbb04b0070af8630f1e3db520d8186f..a3c9196fbf5bc895aa076849f7d36a52269d7678 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -955,6 +955,7 @@ public final class CraftServer implements Server {