cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore cancelled events.

Browse Source
This commit is contained in:
drtshock
2015-04-29 08:51:35 -05:00
parent ec609f329e
commit 9fe5c3ef56
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+11 -10
View File
@@ -28,6 +28,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
@@ -67,17 +68,17 @@ public class Listeners implements Listener {
} }
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onTeleport(PlayerTeleportEvent event) { public void onTeleport(PlayerTeleportEvent event) {
saveVault(event.getPlayer()); saveVault(event.getPlayer());
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH)
public void onQuit(PlayerQuitEvent event) { public void onQuit(PlayerQuitEvent event) {
saveVault(event.getPlayer()); saveVault(event.getPlayer());
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH)
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) { if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) {
@@ -86,12 +87,12 @@ public class Listeners implements Listener {
} }
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH)
public void onDeath(PlayerDeathEvent event) { public void onDeath(PlayerDeathEvent event) {
saveVault(event.getEntity()); saveVault(event.getEntity());
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onClose(InventoryCloseEvent event) { public void onClose(InventoryCloseEvent event) {
HumanEntity he = event.getPlayer(); HumanEntity he = event.getPlayer();
if (he instanceof Player) { if (he instanceof Player) {
@@ -99,7 +100,7 @@ public class Listeners implements Listener {
} }
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onInteract(PlayerInteractEvent event) { public void onInteract(PlayerInteractEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
@@ -187,17 +188,17 @@ public class Listeners implements Listener {
} }
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onBlockPhysics(BlockPhysicsEvent event) { public void onBlockPhysics(BlockPhysicsEvent event) {
blockChangeCheck(event.getBlock().getLocation()); blockChangeCheck(event.getBlock().getLocation());
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onEntityChangeBlock(EntityChangeBlockEvent event) { public void onEntityChangeBlock(EntityChangeBlockEvent event) {
blockChangeCheck(event.getBlock().getLocation()); blockChangeCheck(event.getBlock().getLocation());
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
blockChangeCheck(event.getBlock().getLocation()); blockChangeCheck(event.getBlock().getLocation());
} }
@@ -218,7 +219,7 @@ public class Listeners implements Listener {
} }
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onInteractEntity(PlayerInteractEntityEvent event) { public void onInteractEntity(PlayerInteractEntityEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
EntityType type = event.getRightClicked().getType(); EntityType type = event.getRightClicked().getType();