Merge remote-tracking branch 'origin/1.21.1' into 1.21.1

MohistMC · Oct 17, 2024 · dc92431 · dc92431
2 parents 0bbced1 + 4346312
commit dc92431
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/banner-server/src/main/java/com/mohistmc/banner/mixin/world/entity/MixinEntity.java b/banner-server/src/main/java/com/mohistmc/banner/mixin/world/entity/MixinEntity.java
@@ -337,6 +337,11 @@ public boolean canCollideWithBukkit(Entity entity) {
         Bukkit.getPluginManager().callEvent(event);
     }
 
+    @Inject(method = "setPosRaw", at = @At("RETURN"))
+    private void banner$setPosRaw(double x, double y, double z, CallbackInfo ci) {
+        if (!this.level.isClientSide && !this.isRemoved()) this.level.getChunk((int) Math.floor(x) >> 4, (int) Math.floor(z) >> 4); // Banner - ensure target chunk is loaded.
+    }
+
     @Inject(method = "setRot", at = @At(value = "HEAD"))
     public void banner$infCheck(float yaw, float pitch, CallbackInfo ci) {
         // CraftBukkit start - yaw was sometimes set to NaN, so we need to set it back to 0