Add for 1.21

IntellectualSites · Sep 20, 2024 · 875b1db · 875b1db
1 parent 5554acb
commit 875b1db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightFaweAdapter.java b/...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightFaweAdapter.java
@@ -646,7 +646,7 @@ public IBatchProcessor getTickingPostProcessor() {
     }
 
     @Override
-    public PlacementStateProcessor getPlatformPlacementProcessor(Extent extent, BlockTypeMask mask, Region region ) {
+    public PlacementStateProcessor getPlatformPlacementProcessor(Extent extent, BlockTypeMask mask, Region region) {
         return new PaperweightPlacementStateProcessor(extent, mask, region);
     }
 

diff --git a/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java b/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java
@@ -821,8 +821,7 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
                 if (bitMask == 0 && biomes == null && !lightUpdate) {
                     callback = null;
                 } else {
-                    int finalMask = bitMask != 0 ? bitMask : lightUpdate ? set.getBitMask() : 0;
-                    boolean finalLightUpdate = lightUpdate;
+                    final int finalBitMask = bitMask;
                     callback = () -> {
                         // Set Modified
                         nmsChunk.setLightCorrect(true); // Set Modified
@@ -831,7 +830,7 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
                         // send to player
                         if (!set
                                 .getSideEffectSet()
-                                .shouldApply(SideEffect.LIGHTING) || !Settings.settings().LIGHTING.DELAY_PACKET_SENDING || finalMask == 0 && biomes != null) {
+                                .shouldApply(SideEffect.LIGHTING) || !Settings.settings().LIGHTING.DELAY_PACKET_SENDING || finalBitMask == 0 && biomes != null) {
                             this.send();
                         }
                         if (finalizer != null) {

diff --git a/...ain/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightLevelProxy.java b/...ain/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightLevelProxy.java
@@ -20,8 +20,8 @@
 public class PaperweightLevelProxy extends ServerLevel {
 
     protected ServerLevel serverLevel;
-    private PaperweightFaweAdapter adapter;
     private PaperweightPlacementStateProcessor processor;
+    private PaperweightFaweAdapter adapter;
 
     @SuppressWarnings("DataFlowIssue")
     private PaperweightLevelProxy() {

diff --git a/...sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlacementStateProcessor.java b/...sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlacementStateProcessor.java
@@ -82,8 +82,8 @@ protected char getStateAtFor(
                 new BlockHitResult(pos, side, blockPos, false),
                 side.getOpposite()
         ));
-        return newState == null ? BlockTypesCache.ReservedIDs.AIR :
-                adapter.ibdIDToOrdinal(Block.BLOCK_STATE_REGISTRY.getId(newState));
+        return newState == null ? BlockTypesCache.ReservedIDs.AIR : adapter.ibdIDToOrdinal(Block.BLOCK_STATE_REGISTRY.getId(
+                newState));
     }
 
     @Override