Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2025-01-28 11:01:48 +01:00
Code Issues Projects Releases Wiki Activity

Make inPortal Cooldown per Portal and add Cooldown on Player Join

Browse Source
This commit is contained in:
Max Qian 2016-07-30 22:17:06 -07:00
parent 252187c404
commit d5fb63f0a6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/sekwah/advancedportals/listeners/Listeners.java
View File

@ -19,6 +19,7 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerPortalEvent; import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
@ -29,8 +30,6 @@ import java.lang.reflect.Field;
import java.util.HashMap; import java.util.HashMap;
public class Listeners implements Listener { public class Listeners implements Listener {
private HashMap<Player, Boolean> inPortal = new HashMap<Player, Boolean>();
// The needed config values will be stored so they are easier to access later // The needed config values will be stored so they are easier to access later
// an example is in the interact event in this if statement if((!UseOnlyServerAxe || event.getItem().getItemMeta().getDisplayName().equals("\u00A7eP... // an example is in the interact event in this if statement if((!UseOnlyServerAxe || event.getItem().getItemMeta().getDisplayName().equals("\u00A7eP...
private static boolean UseOnlyServerAxe = false; private static boolean UseOnlyServerAxe = false;
@ -76,6 +75,11 @@ public class Listeners implements Listener {
} }
} }
@EventHandler
public void onJoinEvent(PlayerJoinEvent event) {
Portal.cooldown.put(event.getPlayer(), System.currentTimeMillis());
}
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onMoveEvent(PlayerMoveEvent event) { public void onMoveEvent(PlayerMoveEvent event) {
// will check if the player is in the portal or not. // will check if the player is in the portal or not.
@ -84,7 +88,6 @@ public class Listeners implements Listener {
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
if (inPortal.get(player) == null) inPortal.put(player, false);
Location fromloc = event.getFrom(); Location fromloc = event.getFrom();
Location loc = event.getTo(); Location loc = event.getTo();
// Potentially fixes that stupid error cauzed by a bukkit update. // Potentially fixes that stupid error cauzed by a bukkit update.
@ -102,7 +105,7 @@ public class Listeners implements Listener {
if (portal.pos2.getX() <= loc.getX() && portal.pos2.getY() <= loc.getY() && portal.pos2.getZ() <= loc.getZ()) { if (portal.pos2.getX() <= loc.getX() && portal.pos2.getY() <= loc.getY() && portal.pos2.getZ() <= loc.getZ()) {
WarpEvent warpEvent = new WarpEvent(player, portal); WarpEvent warpEvent = new WarpEvent(player, portal);
plugin.getServer().getPluginManager().callEvent(warpEvent); plugin.getServer().getPluginManager().callEvent(warpEvent);
if (inPortal.get(player)) return; if (portal.inPortal.contains(player)) return;
if (!event.isCancelled()) { if (!event.isCancelled()) {
boolean warped = Portal.activate(player, portal); boolean warped = Portal.activate(player, portal);
if (PortalMessagesDisplay == 1 && warped) { if (PortalMessagesDisplay == 1 && warped) {
@ -125,14 +128,14 @@ public class Listeners implements Listener {
player.setMetadata("lavaWarped", new FixedMetadataValue(plugin, true)); player.setMetadata("lavaWarped", new FixedMetadataValue(plugin, true));
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveLavaData(player), 10); Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveLavaData(player), 10);
} }
inPortal.put(player, true); portal.inPortal.add(player);
return; return;
} }
} }
} }
} }
inPortal.put(player, false); portal.inPortal.remove(player);
} }
} }

4
src/com/sekwah/advancedportals/portals/AdvancedPortal.java
View File

@ -1,7 +1,9 @@
package com.sekwah.advancedportals.portals; package com.sekwah.advancedportals.portals;
import java.util.HashSet;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player;
public class AdvancedPortal { public class AdvancedPortal {
@ -24,6 +26,8 @@ public class AdvancedPortal {
public PortalArg[] portalArgs = null; public PortalArg[] portalArgs = null;
public HashSet<Player> inPortal = new HashSet<Player>();
// TODO think of relaying out the data input to a more logical format. // TODO think of relaying out the data input to a more logical format.
public AdvancedPortal(String portalName, Material trigger, String destination, Location pos1, Location pos2, PortalArg... portalArgs) { public AdvancedPortal(String portalName, Material trigger, String destination, Location pos1, Location pos2, PortalArg... portalArgs) {
this(portalName, trigger, pos1, pos2, pos2.getWorld().getName(), portalArgs); this(portalName, trigger, pos1, pos2, pos2.getWorld().getName(), portalArgs);