2021-06-11 12:02:28 +00:00
|
|
|
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
|
2022-08-08 15:25:41 +00:00
|
|
|
index fa90f805e87985fae1875ded3b295c4736cc7aee..39ddb080e9a296fa499ea2959e22172500db6235 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2022-07-27 22:10:27 +00:00
|
|
|
@@ -1124,6 +1124,11 @@ public abstract class PlayerList {
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
|
|
|
|
+ // Paper start - add recalculatePermissions parameter
|
2021-08-24 23:30:26 +00:00
|
|
|
+ this.sendPlayerPermissionLevel(player, permissionLevel, true);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
2021-08-24 23:30:26 +00:00
|
|
|
+ public void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel, boolean recalculatePermissions) {
|
2021-06-11 12:02:28 +00:00
|
|
|
+ // Paper end
|
2021-08-24 23:30:26 +00:00
|
|
|
if (player.connection != null) {
|
2021-06-11 12:02:28 +00:00
|
|
|
byte b0;
|
|
|
|
|
2022-07-27 22:10:27 +00:00
|
|
|
@@ -1138,8 +1143,10 @@ public abstract class PlayerList {
|
2021-08-24 23:30:26 +00:00
|
|
|
player.connection.send(new ClientboundEntityEventPacket(player, b0));
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
+ if (recalculatePermissions) { // Paper
|
2021-08-24 23:30:26 +00:00
|
|
|
player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
|
|
|
|
this.server.getCommands().sendCommands(player);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ } // Paper
|
|
|
|
}
|
|
|
|
|
2022-06-08 07:30:41 +00:00
|
|
|
public boolean isWhiteListed(GameProfile profile) {
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2022-08-08 15:25:41 +00:00
|
|
|
index 4c7d84a8f0f186dba18dba528ed324a0808605e3..8024b7bcc18a9b2298864d53230d54c23b9d1166 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2022-06-08 07:49:02 +00:00
|
|
|
@@ -606,6 +606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 12:02:28 +00:00
|
|
|
? (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]");
|
|
|
|
+
|
2021-08-24 23:30:26 +00:00
|
|
|
+ this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
2021-06-14 19:58:32 +00:00
|
|
|
@Override
|