From 28543aa9576c88c469bb774a3b6a0783f1cdad3f 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 | 3 ++- src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index 7b79ee4fe5..6398c367f9 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -712,7 +712,7 @@ 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); - this.d(entityplayer1); + if (net.pl3x.purpur.PurpurConfig.updatePermissionsOnWorldChange) updatePermissions(entityplayer1); // Purpur if (!entityplayer.playerConnection.isDisconnected()) { worldserver.addPlayerRespawn(entityplayer1); this.players.add(entityplayer1); @@ -755,6 +755,7 @@ public abstract class PlayerList { return entityplayer1; } + public void updatePermissions(EntityPlayer entityPlayer) { d(entityPlayer); } // Purpur public void d(EntityPlayer entityplayer) { GameProfile gameprofile = entityplayer.getProfile(); int i = this.server.b(gameprofile); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 44232346e1..22df3577cc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,11 @@ public class PurpurConfig { useBetterMending = getBoolean("settings.use-better-mending", useBetterMending); } + public static boolean updatePermissionsOnWorldChange = false; + private static void updatePermissionsOnWorldChange() { + updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange); + } + public static boolean requireShiftToMount = true; private static void requireShiftToMount() { requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); -- 2.24.0.rc1