Avoid map lookup in isMovementBlocker calls (#2906)

IntellectualSites · Sep 3, 2024 · 378334b · 378334b
1 parent a369513
commit 378334b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightBlockMaterial.java b/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightBlockMaterial.java
@@ -135,9 +135,10 @@ public boolean isTicksRandomly() {
         return block.isRandomlyTicking(blockState);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean isMovementBlocker() {
-        return craftMaterial.isSolid();
+        return blockState.blocksMotion();
     }
 
     @Override

diff --git a/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightBlockMaterial.java b/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightBlockMaterial.java
@@ -125,9 +125,10 @@ public boolean isTicksRandomly() {
         return block.isRandomlyTicking(blockState);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean isMovementBlocker() {
-        return craftMaterial.isSolid();
+        return blockState.blocksMotion();
     }
 
     @Override

diff --git a/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightBlockMaterial.java b/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightBlockMaterial.java
@@ -126,9 +126,10 @@ public boolean isTicksRandomly() {
         return blockState.isRandomlyTicking();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean isMovementBlocker() {
-        return craftMaterial.isSolid();
+        return blockState.blocksMotion();
     }
 
     @Override

diff --git a/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightBlockMaterial.java b/.../java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightBlockMaterial.java
@@ -126,9 +126,10 @@ public boolean isTicksRandomly() {
         return blockState.isRandomlyTicking();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean isMovementBlocker() {
-        return craftMaterial.isSolid();
+        return blockState.blocksMotion();
     }
 
     @Override