Skip to content

Commit 751156d

Browse files
committed
fix: cui not showing for non-opped players
-> decupled from fake block handling chore: up deprecation version
1 parent a088512 commit 751156d

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,14 @@ public <B extends BlockStateHolder<B>> void sendFakeBlock(BlockVector3 pos, @Nul
460460
adapter.sendFakeNBT(player, pos, tileState, nbtData);
461461
}
462462

463+
@Override
464+
public void sendFakeOP() {
465+
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
466+
if (adapter != null) {
467+
adapter.sendFakeOP(player);
468+
}
469+
}
470+
463471
//FAWE start
464472
@Override
465473
public void sendTitle(Component title, Component sub) {

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ default void tickWatchdog() {
195195
*
196196
* @deprecated Only works for structure blocks
197197
*/
198-
@Deprecated(since = "2.14.4")
198+
@Deprecated(since = "2.15.1")
199199
void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData);
200200

201201
/**

worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,6 +1530,7 @@ public void updateServerCUI(Actor actor) {
15301530
}
15311531
cuiTemporaryBlock = tempCuiTemporaryBlock;
15321532
player.sendFakeBlock(cuiTemporaryBlock, block);
1533+
player.sendFakeOP();
15331534
} else if (cuiTemporaryBlock != null) {
15341535
// Remove the old block
15351536
player.sendFakeBlock(cuiTemporaryBlock, null);

worldedit-core/src/main/java/com/sk89q/worldedit/entity/Player.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ default boolean trySetPosition(Vector3 pos, float pitch, float yaw) {
342342
*/
343343
<B extends BlockStateHolder<B>> void sendFakeBlock(BlockVector3 pos, @Nullable B block);
344344

345+
void sendFakeOP();
346+
345347
//FAWE start
346348
/**
347349
* Get the player's current allowed WorldEdit regions.

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,4 +787,8 @@ public <B extends BlockStateHolder<B>> void sendFakeBlock(BlockVector3 pos, @Nul
787787

788788
}
789789

790+
public void sendFakeOP() {
791+
792+
}
793+
790794
}

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ public <B extends BlockStateHolder<B>> void sendFakeBlock(BlockVector3 pos, @Nul
206206
basePlayer.sendFakeBlock(pos, block);
207207
}
208208

209+
@Override
210+
public void sendFakeOP() {
211+
basePlayer.sendFakeOP();
212+
}
213+
209214
@Override
210215
public void findFreePosition(final Location searchPos) {
211216
basePlayer.findFreePosition(searchPos);

0 commit comments

Comments
 (0)