Upstream
/
Advanced-Portals
mirror of https://github.com/sekwah41/Advanced-Portals.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

The warpevent is now activated

This commit is contained in:
sekwah41 2014-11-14 17:50:31 +00:00
parent dff5950659
commit ed2acbdb7a
3 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Advanced Portals/src/com/sekwah/advancedportals/Listeners.java
View File

@ -16,6 +16,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.metadata.FixedMetadataValue;
import com.sekwah.advancedportals.DataCollector.DataCollector;
import com.sekwah.advancedportals.events.WarpEvent;
import com.sekwah.advancedportals.portalcontrolls.AdvancedPortal;
import com.sekwah.advancedportals.portalcontrolls.Portal;
@ -96,18 +97,27 @@ public class Listeners implements Listener {
if(Portal.Portals[portalId].pos2.getX() <= loc.getX() && Portal.Portals[portalId].pos2.getY() <= loc.getY() && Portal.Portals[portalId].pos2.getZ() <= loc.getZ()){
boolean warped = Portal.activate(player, portal.portalName);
if(DefaultPortalMessages && warped){
ConfigAccessor config = new ConfigAccessor(plugin, "Portals.yml");
player.sendMessage("");
player.sendMessage("§a[§eAdvancedPortals§a] You have warped to §e" + config.getConfig().getString(Portal.Portals[portalId].portalName + ".destination") + ".");
player.sendMessage("");
WarpEvent warpEvent = new WarpEvent(player, portal.portalName);
plugin.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
boolean warped = Portal.activate(player, portal.portalName);
if(DefaultPortalMessages && warped){
ConfigAccessor config = new ConfigAccessor(plugin, "Portals.yml");
player.sendMessage("");
player.sendMessage("§a[§eAdvancedPortals§a] You have warped to §e" + config.getConfig().getString(Portal.Portals[portalId].portalName + ".destination") + ".");
player.sendMessage("");
}
if(!warped){
player.teleport(fromloc);
event.setCancelled(true);
}
}
else{
}
if(!warped){
player.teleport(fromloc);
event.setCancelled(true);
}
if(Portal.Portals[portalId].trigger.equals(Material.PORTAL)){
final Player finalplayer = event.getPlayer();

48
Advanced Portals/src/com/sekwah/advancedportals/events/WarpEvent.java
View File

@ -4,6 +4,8 @@ import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Cancellable;
import com.sekwah.advancedportals.portalcontrolls.Portal;
public final class WarpEvent extends Event implements Cancellable {
@ -14,17 +16,24 @@ public final class WarpEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private String message;
private boolean cancelled;
private boolean cancelled = false;
private Player player;
private String portalName;
private boolean hasWarped = false;
public WarpEvent(Player player, String portalName) {
// add code for the custom listener
this.player = player;
this.portalName = portalName;
}
public String getMessage() {
return message;
}
/**
* Returns if the event has been cancelled
*
* @return cancelled
*/
public boolean isCancelled() {
return cancelled;
}
@ -32,6 +41,29 @@ public final class WarpEvent extends Event implements Cancellable {
public void setCancelled(boolean cancel) {
cancelled = cancel;
}
/**
* If the
*
* @param warped
*/
public void setHasWarped(boolean warped){
this.hasWarped = warped;
}
/**
* This will return true if another plugin has warped the player(and set this to true)
*
* @return hasWarped
*/
public boolean getHasWarped(){
return hasWarped;
}
public Player getPlayer(){
return player;
}
public HandlerList getHandlers() {
return handlers;

2
Advanced Portals/src/com/sekwah/advancedportals/portalcontrolls/Portal.java
View File

@ -15,6 +15,7 @@ import com.sekwah.advancedportals.AdvancedPortalsPlugin;
import com.sekwah.advancedportals.ConfigAccessor;
import com.sekwah.advancedportals.DataCollector.DataCollector;
import com.sekwah.advancedportals.destinations.Destination;
import com.sekwah.advancedportals.events.WarpEvent;
public class Portal {
@ -272,7 +273,6 @@ public class Portal {
for(int i = keys.length - 1; i >= 0; i--){
String key = keys[i].toString();
if(key.startsWith(name + ".")){
System.out.println(key);
config.getConfig().set(key, null);
}
}