52 lines
2.2 KiB
Diff
52 lines
2.2 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
index 4bc9b3b08b42becfd66f39cb0d639bdcae18d45c..1eb44877e7384ae0a028a12b832684126b8d50ec 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
@@ -1056,6 +1056,11 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
|
||
|
|
private void a(EntityPlayer entityplayer, int i) {
|
||
|
|
+ // Paper start - add recalculatePermissions parameter
|
||
|
|
+ this.sendPlayerOperatorStatus(entityplayer, i, true);
|
||
|
|
+ }
|
||
|
|
+ public void sendPlayerOperatorStatus(EntityPlayer entityplayer, int i, boolean recalculatePermissions) {
|
||
|
|
+ // Paper end
|
||
|
|
if (entityplayer.playerConnection != null) {
|
||
|
|
byte b0;
|
||
|
|
|
||
|
|
@@ -1070,8 +1075,10 @@ public abstract class PlayerList {
|
||
|
|
entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0));
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (recalculatePermissions) { // Paper
|
||
|
|
entityplayer.getBukkitEntity().recalculatePermissions(); // CraftBukkit
|
||
|
|
this.server.getCommandDispatcher().a(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 58caa3240b90cdc661e1e32e3f5c312ed62c3c21..7c18b22c7b93b6ca1189e481dde17476797b8fd5 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -2100,6 +2100,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().getMinecraftServer().getPlayerList().sendPlayerOperatorStatus(this.getHandle(), level, false);
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
// Spigot start
|