Blocks cannot solidify on incomplete blocks.

Lxns-Network · Oct 22, 2024 · 3059c70 · 3059c70
1 parent c987c2f
commit 3059c70
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/dev/tylerm/khs/game/util/Disguise.java b/src/main/java/dev/tylerm/khs/game/util/Disguise.java
@@ -117,7 +117,7 @@ public void update() {
     }
 
     private void onSolidifyChanged(boolean solid) {
-        if(solid){
+        if (solid) {
             var tp = new EntityTeleportPacket();
             tp.setEntity(getPlayer());
             // seekers may see a "phantom" when hiders come back to their block.
@@ -129,7 +129,7 @@ private void onSolidifyChanged(boolean solid) {
             for (Player seeker : Main.getInstance().getBoard().getSeekers()) {
                 tp.send(seeker);
             }
-        }else{
+        } else {
             var tp = new EntityTeleportPacket();
             tp.setEntity(getPlayer());
             var loc = getPlayer().getLocation();
@@ -184,8 +184,7 @@ private void toggleEntityVisibility(Entity entity, boolean show) {
                 if (entity instanceof Player p) {
                     receiver.showPlayer(Main.getInstance(), p);
                 } else receiver.showEntity(Main.getInstance(), entity);
-            } else
-            if (entity instanceof Player p) {
+            } else if (entity instanceof Player p) {
                 receiver.hidePlayer(Main.getInstance(), p);
             } else receiver.hideEntity(Main.getInstance(), entity);
             //Main.getInstance().getEntityHider().hideEntity(receiver, entity);
@@ -228,6 +227,13 @@ private void solidifyUpdate(Location lastLocation, int time) {
             solidifying = false;
             return;
         }
+        var pos = currentLocation.getBlock();
+        if (!pos.getType().isAir()
+                && pos.getType() != Material.WATER
+                && (currentLocation.getY() - pos.getY() > 0)) {
+            solidifying = false;
+            return;
+        }
         if (time == 0) {
             ActionBar.clearActionBar(hider);
             setSolidify(true);