just give up and mixin to except spectator

andantet · Dec 15, 2022 · 5455791 · 5455791
1 parent feccdf9
commit 5455791
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/src/main/java/me/andante/noclip/mixin/EndGatewayBlockEntityMixin.java b/src/main/java/me/andante/noclip/mixin/EndGatewayBlockEntityMixin.java
diff --git a/src/main/java/me/andante/noclip/mixin/EntityPredicatesMixin.java b/src/main/java/me/andante/noclip/mixin/EntityPredicatesMixin.java
@@ -23,6 +23,13 @@ private static void onValidLivingEntity(Entity entity, CallbackInfoReturnable<Bo
         }
     }
 
+    @Inject(method = "method_24517", at = @At("TAIL"), cancellable = true)
+    private static void onExceptSpectator(Entity entity, CallbackInfoReturnable<Boolean> cir) {
+        if (cir.getReturnValueZ()) {
+            if (entity instanceof ClippingEntity clippingEntity && clippingEntity.isClipping()) cir.setReturnValue(false);
+        }
+    }
+
     /**
      * Removes collision entirely from clipping players.
      */

diff --git a/src/main/resources/noclip.mixins.json b/src/main/resources/noclip.mixins.json
@@ -5,7 +5,6 @@
   "package": "me.andante.noclip.mixin",
   "mixins": [
     "AreaEffectCloudEntityMixin",
-    "EndGatewayBlockEntityMixin",
     "EntityMixin",
     "EntityPredicatesMixin",
     "ExplosionMixin",