Fix mixin conflict with Spelunkery (#1253)

IzzelAliz · Mar 10, 2024 · 3fa5285 · 3fa5285
1 parent 3f2b5ae
commit 3fa5285
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.../java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartMixin.java b/.../java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartMixin.java
@@ -2,7 +2,6 @@
 
 import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
 import io.izzel.arclight.common.bridge.core.entity.vehicle.AbstractMinecartBridge;
-import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import io.izzel.arclight.common.bridge.core.world.level.block.BlockBridge;
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.BlockTags;
@@ -74,17 +73,15 @@ public abstract class AbstractMinecartMixin extends VehicleEntityMixin implement
         maxSpeed = 0.4D;
     }
 
+    private transient Location arclight$prevLocation;
+
     /**
      * @author IzzelAliz
      * @reason
      */
     @Overwrite
     public void tick() {
-        double prevX = this.getX();
-        double prevY = this.getY();
-        double prevZ = this.getZ();
-        float prevYaw = this.getYRot();
-        float prevPitch = this.getXRot();
+        this.arclight$prevLocation = new Location(null, this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
         if (this.getHurtTime() > 0) {
             this.setHurtTime(this.getHurtTime() - 1);
         }
@@ -142,8 +139,10 @@ public void tick() {
                 this.flipped = !this.flipped;
             }
             this.setRot(this.getYRot(), this.getXRot());
-            org.bukkit.World bworld = ((WorldBridge) this.level()).bridge$getWorld();
-            Location from = new Location(bworld, prevX, prevY, prevZ, prevYaw, prevPitch);
+            org.bukkit.World bworld = this.level().bridge$getWorld();
+            Location from = this.arclight$prevLocation;
+            this.arclight$prevLocation = null;
+            from.setWorld(bworld);
             Location to = new Location(bworld, this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
             Vehicle vehicle = (Vehicle) this.getBukkitEntity();
             Bukkit.getPluginManager().callEvent(new VehicleUpdateEvent(vehicle));