mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 11:50:06 +01:00
52 lines
2.3 KiB
Diff
52 lines
2.3 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 cf457f6b6ee2968f68f4eede30bb703a6a4f990b..1358993217e601e3bab6e0a4e8c55d555865a13e 100644
|
||
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
@@ -1138,6 +1138,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;
|
||
|
|
||
|
@@ -1152,8 +1157,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 41987716afa8ec34214868373df97d0e8f8b27c1..e81de526a847c730abf86016354c1dc57780ec8b 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
@@ -2300,6 +2300,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
|