Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-26 18:11:52 +01:00
Code Issues Projects Releases Wiki Activity

Rename listening methods to be a little more descriptive of their purpose.

Browse Source
This commit is contained in:
KHobbits 2014-05-24 18:47:40 +01:00
parent c929ebb89a
commit cf29a0ba6a
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/Jails.java
View File

@ -198,7 +198,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
private class JailListener implements Listener
{
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockBreak(final BlockBreakEvent event)
public void onJailBlockBreak(final BlockBreakEvent event)
{
final User user = ess.getUser(event.getPlayer());
if (user.isJailed())
@ -208,7 +208,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockPlace(final BlockPlaceEvent event)
public void onJailBlockPlace(final BlockPlaceEvent event)
{
final User user = ess.getUser(event.getPlayer());
if (user.isJailed())
@ -218,7 +218,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockDamage(final BlockDamageEvent event)
public void onJailBlockDamage(final BlockDamageEvent event)
{
final User user = ess.getUser(event.getPlayer());
if (user.isJailed())
@ -228,7 +228,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
public void onJailEntityDamageByEntity(final EntityDamageByEntityEvent event)
{
if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
{
@ -246,7 +246,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerInteract(final PlayerInteractEvent event)
public void onJailPlayerInteract(final PlayerInteractEvent event)
{
final User user = ess.getUser(event.getPlayer());
if (user.isJailed())
@ -256,7 +256,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerRespawn(final PlayerRespawnEvent event)
public void onJailPlayerRespawn(final PlayerRespawnEvent event)
{
final User user = ess.getUser(event.getPlayer());
if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
@ -282,7 +282,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerTeleport(final PlayerTeleportEvent event)
public void onJailPlayerTeleport(final PlayerTeleportEvent event)
{
final User user = ess.getUser(event.getPlayer());
if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
@ -309,7 +309,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerJoin(final PlayerJoinEvent event)
public void onJailPlayerJoin(final PlayerJoinEvent event)
{
final User user = ess.getUser(event.getPlayer());
final long currentTime = System.currentTimeMillis();

16
Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
View File

@ -29,7 +29,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockBreak(final BlockBreakEvent event)
public void onSignBlockBreak(final BlockBreakEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -86,7 +86,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onSignChange2(final SignChangeEvent event)
public void onSignSignChange2(final SignChangeEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -113,7 +113,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onSignChange(final SignChangeEvent event)
public void onSignSignChange(final SignChangeEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -138,7 +138,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockPlace(final BlockPlaceEvent event)
public void onSignBlockPlace(final BlockPlaceEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -172,7 +172,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockBurn(final BlockBurnEvent event)
public void onSignBlockBurn(final BlockBurnEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -201,7 +201,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockIgnite(final BlockIgniteEvent event)
public void onSignBlockIgnite(final BlockIgniteEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -230,7 +230,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.LOW)
public void onBlockPistonExtend(final BlockPistonExtendEvent event)
public void onSignBlockPistonExtend(final BlockPistonExtendEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -261,7 +261,7 @@ public class SignBlockListener implements Listener
}
@EventHandler(priority = EventPriority.LOW)
public void onBlockPistonRetract(final BlockPistonRetractEvent event)
public void onSignBlockPistonRetract(final BlockPistonRetractEvent event)
{
if (ess.getSettings().areSignsDisabled())
{

4
Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
View File

@ -20,7 +20,7 @@ public class SignEntityListener implements Listener
}
@EventHandler(priority = EventPriority.LOW)
public void onEntityExplode(final EntityExplodeEvent event)
public void onSignEntityExplode(final EntityExplodeEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@ -50,7 +50,7 @@ public class SignEntityListener implements Listener
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityChangeBlock(final EntityChangeBlockEvent event)
public void onSignEntityChangeBlock(final EntityChangeBlockEvent event)
{
if (ess.getSettings().areSignsDisabled())
{

2
Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
View File

@ -26,7 +26,7 @@ public class SignPlayerListener implements Listener
//This is because when the block place is cancelled (for example not enough space for the block to be placed),
//the event will be marked as cancelled, thus preventing 30% of sign purchases.
@EventHandler(priority = EventPriority.LOW)
public void onPlayerInteract(final PlayerInteractEvent event)
public void onSignPlayerInteract(final PlayerInteractEvent event)
{
if (ess.getSettings().areSignsDisabled())
{