Fixed #367

MohistMC · Jan 27, 2025 · 726ab11 · 726ab11
1 parent a1cd459
commit 726ab11
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...rver/src/main/java/com/mohistmc/banner/eventhandler/dispatcher/EntityEventDispatcher.java b/...rver/src/main/java/com/mohistmc/banner/eventhandler/dispatcher/EntityEventDispatcher.java
@@ -12,6 +12,7 @@
 
 public class EntityEventDispatcher {
 
+    // TODO: not triggered
     public static void dispatchEntityEvent() {
         ServerEntityWorldChangeEvents.AFTER_ENTITY_CHANGE_WORLD.register((originalEntity, newEntity, origin, destination) -> {
             var pos = originalEntity.getOnPos();
@@ -36,6 +37,22 @@ public static void dispatchEntityEvent() {
             PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(player.getBukkitEntity(), origin.getWorld());
             player.level().getCraftServer().getPluginManager().callEvent(changeEvent);
             // CraftBukkit end
+            var pos = player.getOnPos();
+            if (destination.getTypeKey() == LevelStem.NETHER) {
+                player.callPortalEvent(player, destination, new PositionImpl(pos.getX(), pos.getY(), pos.getZ()),
+                        PlayerTeleportEvent.TeleportCause.NETHER_PORTAL,
+                        16, 16);
+            }else if (destination.getTypeKey() == LevelStem.END) {
+                if (Bukkit.getAllowEnd()) {
+                    player.callPortalEvent(player, destination, new PositionImpl(pos.getX(), pos.getY(), pos.getZ()),
+                            PlayerTeleportEvent.TeleportCause.END_PORTAL,
+                            128, 16);
+                }
+            }else {
+                player.callPortalEvent(player, destination, new PositionImpl(pos.getX(), pos.getY(), pos.getZ()),
+                        PlayerTeleportEvent.TeleportCause.UNKNOWN,
+                        0, 0);
+            }
         });
 
         ServerLivingEntityEvents.AFTER_DEATH.register((entity, source) -> {

diff --git a/modules/banner-server/src/main/java/com/mohistmc/banner/mixin/world/entity/MixinEntity.java b/modules/banner-server/src/main/java/com/mohistmc/banner/mixin/world/entity/MixinEntity.java
@@ -317,6 +317,13 @@ public void postTick() {
         }
     }
 
+    @Inject(method = "handleNetherPortal", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;changeDimension(Lnet/minecraft/server/level/ServerLevel;)Lnet/minecraft/world/entity/Entity;"))
+    public void banner$changeDimension(CallbackInfo ci) {
+        if ((Entity)(Object)this instanceof ServerPlayer serverPlayer) {
+            serverPlayer.pushChangeDimensionCause(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
+        }
+    }
+
     public AtomicBoolean callEntityCombustEvent = new AtomicBoolean(true);
 
     @Override