66 lines
2.8 KiB
Diff
66 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
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 eed8b1055c4c5026ebe3ebf1541ac94beda3112e..235c9aef7615948be74b336fd922b80f6b4e6fac 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -1112,22 +1112,29 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
|
|
- if (player.connection != null) {
|
|
+ // Paper start - add recalculatePermissions parameter
|
|
+ this.sendPlayerOperatorStatus(player, permissionLevel, true);
|
|
+ }
|
|
+ public void sendPlayerOperatorStatus(ServerPlayer entityplayer, int i, boolean recalculatePermissions) {
|
|
+ // Paper end
|
|
+ if (entityplayer.connection != null) {
|
|
byte b0;
|
|
|
|
- if (permissionLevel <= 0) {
|
|
+ if (i <= 0) {
|
|
b0 = 24;
|
|
- } else if (permissionLevel >= 4) {
|
|
+ } else if (i >= 4) {
|
|
b0 = 28;
|
|
} else {
|
|
- b0 = (byte) (24 + permissionLevel);
|
|
+ b0 = (byte) (24 + i);
|
|
}
|
|
|
|
- player.connection.send(new ClientboundEntityEventPacket(player, b0));
|
|
+ entityplayer.connection.send(new ClientboundEntityEventPacket(entityplayer, b0));
|
|
}
|
|
|
|
- player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
|
|
- this.server.getCommands().sendCommands(player);
|
|
+ if (recalculatePermissions) { // Paper
|
|
+ entityplayer.getBukkitEntity().recalculatePermissions(); // CraftBukkit
|
|
+ this.server.getCommands().sendCommands(entityplayer);
|
|
+ } // Paper
|
|
}
|
|
|
|
// Paper start
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 049bfec8e8e078f335d34a96707320bf48f336c2..8d48f45d695b15eb136bc7609315f5dc88104e7c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -552,6 +552,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().sendPlayerOperatorStatus(this.getHandle(), level, false);
|
|
+ }
|
|
// Paper end
|
|
|
|
@Override
|