diff options
author | James Clarke <jamesrtclarke@me.com> | 2012-02-15 19:54:01 +0000 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-29 14:00:34 -0500 |
commit | 42d8d07051b98d20dba54388c35880b70e67d7cc (patch) | |
tree | dd71ce4127bced9759b0939c7c0eea8213a8903f | |
parent | a3038f4615d5f7c084c14e4b001b75af2f65c45e (diff) | |
download | bukkit-42d8d07051b98d20dba54388c35880b70e67d7cc.tar bukkit-42d8d07051b98d20dba54388c35880b70e67d7cc.tar.gz bukkit-42d8d07051b98d20dba54388c35880b70e67d7cc.tar.lz bukkit-42d8d07051b98d20dba54388c35880b70e67d7cc.tar.xz bukkit-42d8d07051b98d20dba54388c35880b70e67d7cc.zip |
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.
-rw-r--r-- | src/main/java/org/bukkit/event/player/PlayerPortalEvent.java | 5 | ||||
-rw-r--r-- | src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java | 8 |
2 files changed, 13 insertions, 0 deletions
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 @@ -44,6 +44,14 @@ public class PlayerTeleportEvent extends PlayerMoveEvent { */ 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 */ UNKNOWN; |