aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0569-Add-sendOpLevel-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0569-Add-sendOpLevel-API.patch')
-rw-r--r--patches/server/0569-Add-sendOpLevel-API.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/patches/server/0569-Add-sendOpLevel-API.patch b/patches/server/0569-Add-sendOpLevel-API.patch
new file mode 100644
index 0000000000..67a367d475
--- /dev/null
+++ b/patches/server/0569-Add-sendOpLevel-API.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <[email protected]>
+Date: Tue, 29 Dec 2020 15:03:03 +0100
+Subject: [PATCH] Add sendOpLevel API
+
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 54fff5ebefa04f64ed1abfd12ebf48762015fae3..c4f5a3bf60302743329b17f9b2dffcee9c1e5ab3 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -1130,6 +1130,11 @@ public abstract class PlayerList {
+ }
+
+ private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
++ // Paper start - add recalculatePermissions parameter
++ this.sendPlayerPermissionLevel(player, permissionLevel, true);
++ }
++ public void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel, boolean recalculatePermissions) {
++ // Paper end
+ if (player.connection != null) {
+ byte b0;
+
+@@ -1144,8 +1149,10 @@ public abstract class PlayerList {
+ player.connection.send(new ClientboundEntityEventPacket(player, b0));
+ }
+
++ if (recalculatePermissions) { // Paper
+ player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
+ this.server.getCommands().sendCommands(player);
++ } // Paper
+ }
+
+ public boolean isWhiteListed(GameProfile profile) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 21f413b1e75c15fae888a4e6dccefbe822ad1c40..0528489348dc12c22bdb306a4b6c5c6a138f5347 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -606,6 +606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
+ : null;
+ }
++
++ @Override
++ public void sendOpLevel(byte level) {
++ Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]");
++
++ this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
++ }
+ // Paper end
+
+ @Override