Update incremental chunk saving
This commit is contained in:
parent
f87d5ab52b
commit
691cdf6f9e
258 changed files with 192 additions and 190 deletions
65
patches/server/0600-Add-sendOpLevel-API.patch
Normal file
65
patches/server/0600-Add-sendOpLevel-API.patch
Normal file
|
@ -0,0 +1,65 @@
|
|||
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 efec443a8e9ab62b365cba3d7a10020f7c636291..14d0345ca49acb0a463df2fdfa6cfc7b6f856244 100644
|
||||
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
@@ -1115,22 +1115,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 476e74d70f594e2d53a21924173cc4aa0882a4fc..a28625f0b6e98b61f395a1b3ee07c2f7bc195893 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
|
Loading…
Add table
Add a link
Reference in a new issue