craftbukkit/nms-patches/BlockPortal.patch

35 lines
1.8 KiB
Diff
Raw Normal View History

2015-05-25 20:37:24 +10:00
--- a/net/minecraft/server/BlockPortal.java
+++ b/net/minecraft/server/BlockPortal.java
2021-03-09 08:47:33 +11:00
@@ -2,6 +2,10 @@
2020-08-12 07:00:00 +10:00
import java.util.Random;
2018-07-15 10:00:00 +10:00
+// CraftBukkit start
+import org.bukkit.event.entity.EntityPortalEnterEvent;
+// CraftBukkit end
+
2018-07-15 10:00:00 +10:00
public class BlockPortal extends Block {
2020-06-25 10:00:00 +10:00
public static final BlockStateEnum<EnumDirection.EnumAxis> AXIS = BlockProperties.E;
2021-03-09 08:47:33 +11:00
@@ -32,7 +36,8 @@
}
2020-06-25 10:00:00 +10:00
if (worldserver.getType(blockposition).a((IBlockAccess) worldserver, blockposition, EntityTypes.ZOMBIFIED_PIGLIN)) {
- Entity entity = EntityTypes.ZOMBIFIED_PIGLIN.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition.up(), EnumMobSpawn.STRUCTURE, false, false);
+ // CraftBukkit - set spawn reason to NETHER_PORTAL
2020-06-25 10:00:00 +10:00
+ Entity entity = EntityTypes.ZOMBIFIED_PIGLIN.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition.up(), EnumMobSpawn.STRUCTURE, false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NETHER_PORTAL);
if (entity != null) {
2020-08-12 07:00:00 +10:00
entity.resetPortalCooldown();
2021-03-09 08:47:33 +11:00
@@ -54,6 +59,10 @@
2019-04-23 12:00:00 +10:00
@Override
2018-07-15 10:00:00 +10:00
public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
2019-04-23 12:00:00 +10:00
if (!entity.isPassenger() && !entity.isVehicle() && entity.canPortal()) {
+ // CraftBukkit start - Entity in portal
+ EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()));
+ world.getServer().getPluginManager().callEvent(event);
+ // CraftBukkit end
2020-06-25 10:00:00 +10:00
entity.d(blockposition);
2015-02-26 22:41:06 +00:00
}