From 42d8d07051b98d20dba54388c35880b70e67d7cc Mon Sep 17 00:00:00 2001 From: James Clarke Date: Wed, 15 Feb 2012 19:54:01 +0000 Subject: Added NETHER_PORTAL and END_PORTAL to the TeleportCause enum. Addresses BUKKIT-265 Added new NETHER_PORTAL and END_PORTAL values to the TeleportCause enum and relevant constructor for PlayerPortalEvent. --- src/main/java/org/bukkit/event/player/PlayerPortalEvent.java | 5 +++++ src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java | 8 ++++++++ 2 files changed, 13 insertions(+) (limited to 'src') diff --git a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java index 432de3ac..83efaa16 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java @@ -17,6 +17,11 @@ public class PlayerPortalEvent extends PlayerTeleportEvent { super(player, from, to); this.travelAgent = pta; } + + public PlayerPortalEvent(Player player, Location from, Location to, TravelAgent pta, TeleportCause cause) { + super(Type.PLAYER_PORTAL, player, from, to, cause); + this.travelAgent = pta; + } public void useTravelAgent(boolean useTravelAgent) { this.useTravelAgent = useTravelAgent; diff --git a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java index e7a8d8a1..55b12fac 100644 --- a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java @@ -43,6 +43,14 @@ public class PlayerTeleportEvent extends PlayerMoveEvent { * Indicates the teleportation was caused by a plugin */ PLUGIN, + /** + * Indicates the teleportation was caused by a player entering a Nether portal + */ + NETHER_PORTAL, + /** + * Indicates the teleportation was caused by a player entering an End portal + */ + END_PORTAL, /** * Indicates the teleportation was caused by an event not covered by this enum */ -- cgit v1.2.3