Fixed StargateTeleportEntityEvent not being posted

MrJake222 · Feb 4, 2021 · 6940b02 · 6940b02
1 parent f421ee8
commit 6940b02
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/mrjake/aunis/stargate/teleportation/EventHorizon.java b/src/main/java/mrjake/aunis/stargate/teleportation/EventHorizon.java
@@ -7,11 +7,13 @@
 import javax.vecmath.Vector2f;
 
 import mrjake.aunis.AunisProps;
+import mrjake.aunis.api.event.StargateTeleportEntityEvent;
 import mrjake.aunis.packet.AunisPacketHandler;
 import mrjake.aunis.packet.stargate.StargateMotionToClient;
 import mrjake.aunis.sound.AunisSoundHelper;
 import mrjake.aunis.sound.SoundEventEnum;
 import mrjake.aunis.stargate.network.StargatePos;
+import mrjake.aunis.tileentity.stargate.StargateAbstractBaseTile;
 import mrjake.aunis.util.AunisAxisAlignedBB;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -105,9 +107,14 @@ public void scheduleTeleportation(StargatePos targetGate) {
 	}
 
 	public void teleportEntity(int entityId) {
-		scheduledTeleportMap.get(entityId).teleport();
+		TeleportPacket packet = scheduledTeleportMap.get(entityId);
+
+		if (!new StargateTeleportEntityEvent((StargateAbstractBaseTile) world.getTileEntity(pos), packet.getTargetGatePos().getTileEntity(), packet.getEntity()).post()) {
+			// Not cancelled
+			packet.teleport();
+			AunisSoundHelper.playSoundEvent(world, gateCenter, SoundEventEnum.WORMHOLE_GO);
+		};
 
-		AunisSoundHelper.playSoundEvent(world, gateCenter, SoundEventEnum.WORMHOLE_GO);
 		scheduledTeleportMap.remove(entityId);
 	}
 

diff --git a/src/main/java/mrjake/aunis/stargate/teleportation/TeleportPacket.java b/src/main/java/mrjake/aunis/stargate/teleportation/TeleportPacket.java
@@ -30,6 +30,14 @@ public TeleportPacket(Entity entity, BlockPos source, StargatePos target, float
 		this.rotation = rotation;
 	}
 
+	public StargatePos getTargetGatePos() {
+		return targetGatePos;
+	}
+
+	public Entity getEntity() {
+		return entity;
+	}
+
 	public void teleport() {
 		TeleportHelper.teleportEntity(entity, sourceGatePos, targetGatePos, rotation, motionVector);