From 0dda123113f721d44dcb11932026737cd2ec8d8e Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Sat, 24 Mar 2018 15:17:56 +0900 Subject: [PATCH 1/8] Adding EssentialsWarpEvent for checking if player is wrapping --- .../src/com/earth2me/essentials/Teleport.java | 7 +++ .../ess3/api/events/EssentialsWarpEvent.java | 48 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index e45523a0ab9..428299a35cf 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -4,6 +4,8 @@ import com.earth2me.essentials.utils.LocationUtil; import net.ess3.api.IEssentials; import net.ess3.api.IUser; +import net.ess3.api.events.EssentialsWarpEvent; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerRespawnEvent; @@ -247,6 +249,11 @@ protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exceptio //The warp function is a wrapper used to teleportPlayer a player to a /warp @Override public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception { + EssentialsWarpEvent event = new EssentialsWarpEvent(teleportee, warp); + Bukkit.getServer().getPluginManager().callEvent(event); + if(event.isCancelled()){ + return; + } Location loc = ess.getWarps().getWarp(warp); teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); if (!teleportee.equals(teleportOwner)) { diff --git a/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java b/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java new file mode 100644 index 00000000000..ab8fff97bc5 --- /dev/null +++ b/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java @@ -0,0 +1,48 @@ +package net.ess3.api.events; + +import net.ess3.api.IUser; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class EssentialsWarpEvent extends Event implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + + private IUser user; + private String warp; + private boolean cancelled = false; + + + public EssentialsWarpEvent(IUser user, String warp){ + this.user = user; + this.warp = warp; + } + + public IUser getUser() { + return user; + } + + public String getWarp() { + return warp; + } + + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean b) { + cancelled = b; + } + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} From d6af21ce9e0b987e87d106a151db2ca11e3c9141 Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Sat, 24 Mar 2018 23:50:15 +0900 Subject: [PATCH 2/8] Spacing --- Essentials/src/com/earth2me/essentials/Teleport.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 428299a35cf..8eabe489126 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -251,6 +251,7 @@ protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exceptio public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception { EssentialsWarpEvent event = new EssentialsWarpEvent(teleportee, warp); Bukkit.getServer().getPluginManager().callEvent(event); + if(event.isCancelled()){ return; } From aadcd8232dd152c72eef898b105c73742bb20ad9 Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Sat, 24 Mar 2018 23:58:34 +0900 Subject: [PATCH 3/8] Adding Trade parameter --- Essentials/src/com/earth2me/essentials/Teleport.java | 2 +- .../src/net/ess3/api/events/EssentialsWarpEvent.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 8eabe489126..5119c82f52c 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -249,7 +249,7 @@ protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exceptio //The warp function is a wrapper used to teleportPlayer a player to a /warp @Override public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception { - EssentialsWarpEvent event = new EssentialsWarpEvent(teleportee, warp); + EssentialsWarpEvent event = new EssentialsWarpEvent(teleportee, warp, chargeFor); Bukkit.getServer().getPluginManager().callEvent(event); if(event.isCancelled()){ diff --git a/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java b/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java index ab8fff97bc5..addbfd84ee5 100644 --- a/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java +++ b/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java @@ -1,5 +1,6 @@ package net.ess3.api.events; +import com.earth2me.essentials.Trade; import net.ess3.api.IUser; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; @@ -11,12 +12,14 @@ public class EssentialsWarpEvent extends Event implements Cancellable { private IUser user; private String warp; + private Trade trade; private boolean cancelled = false; - public EssentialsWarpEvent(IUser user, String warp){ + public EssentialsWarpEvent(IUser user, String warp, Trade trade){ this.user = user; this.warp = warp; + this.trade = trade; } public IUser getUser() { @@ -27,6 +30,10 @@ public String getWarp() { return warp; } + public Trade getTrade() { + return trade; + } + @Override public boolean isCancelled() { return cancelled; From 5176f3c4a7092350ee251f5f89f37cee657f228b Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Sun, 25 Mar 2018 00:20:41 +0900 Subject: [PATCH 4/8] Refactoring --- Essentials/src/com/earth2me/essentials/Teleport.java | 4 ++-- .../events/{EssentialsWarpEvent.java => UserWarpEvent.java} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename Essentials/src/net/ess3/api/events/{EssentialsWarpEvent.java => UserWarpEvent.java} (87%) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 5119c82f52c..6b05cfcdd30 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -4,7 +4,7 @@ import com.earth2me.essentials.utils.LocationUtil; import net.ess3.api.IEssentials; import net.ess3.api.IUser; -import net.ess3.api.events.EssentialsWarpEvent; +import net.ess3.api.events.UserWarpEvent; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -249,7 +249,7 @@ protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exceptio //The warp function is a wrapper used to teleportPlayer a player to a /warp @Override public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception { - EssentialsWarpEvent event = new EssentialsWarpEvent(teleportee, warp, chargeFor); + UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor); Bukkit.getServer().getPluginManager().callEvent(event); if(event.isCancelled()){ diff --git a/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java b/Essentials/src/net/ess3/api/events/UserWarpEvent.java similarity index 87% rename from Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java rename to Essentials/src/net/ess3/api/events/UserWarpEvent.java index addbfd84ee5..5dd0de2be2d 100644 --- a/Essentials/src/net/ess3/api/events/EssentialsWarpEvent.java +++ b/Essentials/src/net/ess3/api/events/UserWarpEvent.java @@ -7,7 +7,7 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -public class EssentialsWarpEvent extends Event implements Cancellable { +public class UserWarpEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); private IUser user; @@ -16,7 +16,7 @@ public class EssentialsWarpEvent extends Event implements Cancellable { private boolean cancelled = false; - public EssentialsWarpEvent(IUser user, String warp, Trade trade){ + public UserWarpEvent(IUser user, String warp, Trade trade){ this.user = user; this.warp = warp; this.trade = trade; From 571353868017a9136fab87cf810de1bfcc67ea51 Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Sun, 25 Mar 2018 02:04:20 +0900 Subject: [PATCH 5/8] Adding #setWarp() to the Event --- Essentials/src/com/earth2me/essentials/Teleport.java | 1 + Essentials/src/net/ess3/api/events/UserWarpEvent.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 6b05cfcdd30..34549b04a33 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -255,6 +255,7 @@ public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause c if(event.isCancelled()){ return; } + warp = event.getWarp(); Location loc = ess.getWarps().getWarp(warp); teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); if (!teleportee.equals(teleportOwner)) { diff --git a/Essentials/src/net/ess3/api/events/UserWarpEvent.java b/Essentials/src/net/ess3/api/events/UserWarpEvent.java index 5dd0de2be2d..6e09db0ffaf 100644 --- a/Essentials/src/net/ess3/api/events/UserWarpEvent.java +++ b/Essentials/src/net/ess3/api/events/UserWarpEvent.java @@ -34,6 +34,10 @@ public Trade getTrade() { return trade; } + public void setWarp(String warp){ + this.warp = warp; + } + @Override public boolean isCancelled() { return cancelled; From 0714f53e0c9d362cf1c60c1c9d4140349a50fb25 Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Mon, 26 Mar 2018 19:19:31 +0900 Subject: [PATCH 6/8] Spacing --- Essentials/src/com/earth2me/essentials/Teleport.java | 2 +- Essentials/src/net/ess3/api/events/UserWarpEvent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 34549b04a33..82d17ffae85 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -252,7 +252,7 @@ public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause c UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor); Bukkit.getServer().getPluginManager().callEvent(event); - if(event.isCancelled()){ + if(event.isCancelled()) { return; } warp = event.getWarp(); diff --git a/Essentials/src/net/ess3/api/events/UserWarpEvent.java b/Essentials/src/net/ess3/api/events/UserWarpEvent.java index 6e09db0ffaf..8c5f8ce4686 100644 --- a/Essentials/src/net/ess3/api/events/UserWarpEvent.java +++ b/Essentials/src/net/ess3/api/events/UserWarpEvent.java @@ -34,7 +34,7 @@ public Trade getTrade() { return trade; } - public void setWarp(String warp){ + public void setWarp(String warp) { this.warp = warp; } From e66e636cf0e34e99a37ef5e6c4a8ac0c68ff634e Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Mon, 26 Mar 2018 19:19:49 +0900 Subject: [PATCH 7/8] Documenting the purpose of the Event --- Essentials/src/net/ess3/api/events/UserWarpEvent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/src/net/ess3/api/events/UserWarpEvent.java b/Essentials/src/net/ess3/api/events/UserWarpEvent.java index 8c5f8ce4686..6d46906f4f9 100644 --- a/Essentials/src/net/ess3/api/events/UserWarpEvent.java +++ b/Essentials/src/net/ess3/api/events/UserWarpEvent.java @@ -6,7 +6,9 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; - +/** + * Called when the player use the command /warp + */ public class UserWarpEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); From 6a24350e06b9e876316ec09d71e57de063e5b68a Mon Sep 17 00:00:00 2001 From: Banbeucmas Date: Sun, 1 Apr 2018 18:26:51 +0900 Subject: [PATCH 8/8] Javadoc? --- Essentials/src/net/ess3/api/events/UserWarpEvent.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Essentials/src/net/ess3/api/events/UserWarpEvent.java b/Essentials/src/net/ess3/api/events/UserWarpEvent.java index 6d46906f4f9..5bcafc6f325 100644 --- a/Essentials/src/net/ess3/api/events/UserWarpEvent.java +++ b/Essentials/src/net/ess3/api/events/UserWarpEvent.java @@ -32,6 +32,10 @@ public String getWarp() { return warp; } + /** + * Getting payment handling information + * @return The payment handling class + */ public Trade getTrade() { return trade; }