From 7f9af99a5df5871cc2ed4c544d07241117f83d7c Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 3 Sep 2019 16:32:53 -0300
Subject: [PATCH] yielding to masa's tweakeroo with TE tick check, so mods
 don't collide

---
 src/main/java/carpet/mixins/World_tickMixin.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/carpet/mixins/World_tickMixin.java b/src/main/java/carpet/mixins/World_tickMixin.java
index e2360922..0d18805d 100644
--- a/src/main/java/carpet/mixins/World_tickMixin.java
+++ b/src/main/java/carpet/mixins/World_tickMixin.java
@@ -57,11 +57,12 @@ public abstract class World_tickMixin implements WorldInterface
 
     @Redirect(method = "tickBlockEntities", at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/block/entity/BlockEntity;hasWorld()Z"
+            target = "Lnet/minecraft/block/entity/BlockEntity;isInvalid()Z",
+            ordinal = 0
     ))
     private boolean checkProcessTEs(BlockEntity blockEntity)
     {
-        return blockEntity.hasWorld() && TickSpeed.process_entities;
+        return blockEntity.isInvalid() || !TickSpeed.process_entities;
     }
 
     @Inject(method = "tickBlockEntities", at = @At(