From b5d48419dd8ae179fad6c71e304c46aa28542b62 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 17:17:47 -0600 Subject: [PATCH] I should sleep or something :3 --- ...e-permissions-for-players-on-world-c.patch | 26 +++++-------------- .../0091-Add-permission-for-F3-N-debug.patch | 6 ++--- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/patches/server/0048-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0048-Don-t-recalculate-permissions-for-players-on-world-c.patch index e9f43c3bb..972436fe2 100644 --- a/patches/server/0048-Don-t-recalculate-permissions-for-players-on-world-c.patch +++ b/patches/server/0048-Don-t-recalculate-permissions-for-players-on-world-c.patch @@ -1,32 +1,18 @@ -From 2e011621b6713aa46e814010bfea008299906ac2 Mon Sep 17 00:00:00 2001 +From 8985b71ba6c91fe873598edf7c55d36769670e59 Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 12 Jul 2019 07:59:35 -0500 Subject: [PATCH] Don't recalculate permissions for players on world change --- - src/main/java/net/minecraft/server/PlayerList.java | 9 +++++---- + src/main/java/net/minecraft/server/PlayerList.java | 6 +++++- src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 2 files changed, 10 insertions(+), 4 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7b79ee4fe..c8868c231 100644 +index 7b79ee4fe..2763dab47 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -32,13 +32,10 @@ import org.bukkit.Location; - import org.bukkit.craftbukkit.util.CraftChatMessage; - import org.bukkit.entity.Player; - import org.bukkit.event.player.PlayerChangedWorldEvent; --import org.bukkit.event.player.PlayerPortalEvent; - import org.bukkit.event.player.PlayerJoinEvent; - import org.bukkit.event.player.PlayerLoginEvent; - import org.bukkit.event.player.PlayerQuitEvent; - import org.bukkit.event.player.PlayerRespawnEvent; --import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; --import org.bukkit.util.Vector; - import org.spigotmc.event.player.PlayerSpawnLocationEvent; - // CraftBukkit end - -@@ -712,7 +709,9 @@ public abstract class PlayerList { +@@ -712,7 +712,9 @@ public abstract class PlayerList { entityplayer1.playerConnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked())); entityplayer1.playerConnection.sendPacket(new PacketPlayOutExperience(entityplayer1.exp, entityplayer1.expTotal, entityplayer1.expLevel)); this.a(entityplayer1, worldserver); @@ -36,7 +22,7 @@ index 7b79ee4fe..c8868c231 100644 if (!entityplayer.playerConnection.isDisconnected()) { worldserver.addPlayerRespawn(entityplayer1); this.players.add(entityplayer1); -@@ -907,10 +906,12 @@ public abstract class PlayerList { +@@ -907,10 +909,12 @@ public abstract class PlayerList { entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0)); } diff --git a/patches/server/0091-Add-permission-for-F3-N-debug.patch b/patches/server/0091-Add-permission-for-F3-N-debug.patch index c966a96c1..c59ef3da6 100644 --- a/patches/server/0091-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0091-Add-permission-for-F3-N-debug.patch @@ -1,4 +1,4 @@ -From d83f60a0f9036de2c64e949e943b39c5f17b2b2a Mon Sep 17 00:00:00 2001 +From f9fb1cbf203215605cde74f6f72540eaeb23d7dc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Dec 2019 04:21:54 -0600 Subject: [PATCH] Add permission for F3+N debug @@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c8868c231..5d6502707 100644 +index 2763dab47..7c422174e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -902,6 +902,7 @@ public abstract class PlayerList { +@@ -905,6 +905,7 @@ public abstract class PlayerList { } else { b0 = (byte) (24 + i); }