AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-07-12 13:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper

Browse Source
This commit is contained in:
Telesphoreo
2024-02-24 16:32:31 -06:00
parent ec0768f1a5
commit ce9b94d9b1
17 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Prevent player banning using duplicate UUIDs
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 6934e9dac0d69c043b73b7c46d59f2d39b37c67f..41b6df194a452cdf9504e0eab4123974a8c8ec33 100644
index 6907d1be36fbdf0856c0e11983218d2fd1f9cb46..298c8a9cd08425e9aa4f222b98d95d92b80951e6 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1667,7 +1667,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -17,7 +17,7 @@ index 6934e9dac0d69c043b73b7c46d59f2d39b37c67f..41b6df194a452cdf9504e0eab4123974
+ if (entity instanceof ServerPlayer serverPlayer) {
+ this.removePlayerImmediately(serverPlayer, Entity.RemovalReason.DISCARDED);
+ } else {
+ entity.discard();
+ entity.discard(null);
+ }
+ // Scissors end
}