mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ci skip] clean up diff from 1.17 update (#6462)

Browse source
This commit is contained in:
Jake Potrebic 2021-08-24 16:30:26 -07:00
parent b2800ba2a9
commit 73b4c45a4a
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
patches/server/Add-sendOpLevel-API.patch
View file

@ -12,35 +12,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) { private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
- if (player.connection != null) {
+ // Paper start - add recalculatePermissions parameter + // Paper start - add recalculatePermissions parameter
+ this.sendPlayerOperatorStatus(player, permissionLevel, true); + this.sendPlayerPermissionLevel(player, permissionLevel, true);
+ } + }
+ public void sendPlayerOperatorStatus(ServerPlayer entityplayer, int i, boolean recalculatePermissions) { + public void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel, boolean recalculatePermissions) {
+ // Paper end + // Paper end
+ if (entityplayer.connection != null) { if (player.connection != null) {
byte b0; byte b0;
- if (permissionLevel <= 0) { @@ -0,0 +0,0 @@ public abstract class PlayerList {
+ if (i <= 0) { player.connection.send(new ClientboundEntityEventPacket(player, b0));
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 + if (recalculatePermissions) { // Paper
+ entityplayer.getBukkitEntity().recalculatePermissions(); // CraftBukkit player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
+ this.server.getCommands().sendCommands(entityplayer); this.server.getCommands().sendCommands(player);
+ } // Paper + } // Paper
} }
@ -58,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public void sendOpLevel(byte level) { + public void sendOpLevel(byte level) {
+ Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]"); + Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]");
+ +
+ this.getHandle().getServer().getPlayerList().sendPlayerOperatorStatus(this.getHandle(), level, false); + this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
+ } + }
// Paper end // Paper end