Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup listener class

Browse Source
This commit is contained in:
Gabriele C 2015-12-10 15:44:24 +01:00
parent 9cbe57015e
commit 9c86fbd8bf
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -50,6 +50,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
* Listener class for player's events
*/ */
public class AuthMePlayerListener implements Listener { public class AuthMePlayerListener implements Listener {
@ -196,12 +197,6 @@ public class AuthMePlayerListener implements Listener {
return; return;
} }
/* IMPOSSIBLE!!!! TODO: check this!
if(Utils.isNPC(player)) {
return;
}
*/
String name = player.getName().toLowerCase(); String name = player.getName().toLowerCase();
String joinMsg = event.getJoinMessage(); String joinMsg = event.getJoinMessage();
@ -369,11 +364,16 @@ public class AuthMePlayerListener implements Listener {
plugin.getManagement().performQuit(player, true); plugin.getManagement().performQuit(player, true);
} }
/*
* <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
* TODO: npc status can be used to bypass security!!!
* <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
*/
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onPlayerPickupItem(PlayerPickupItemEvent event) { public void onPlayerPickupItem(PlayerPickupItemEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
// TODO: npc status can be used to bypass security!!!
if (Utils.checkAuth(player) || Utils.isNPC(player)) { if (Utils.checkAuth(player) || Utils.isNPC(player)) {
return; return;
} }
@ -384,7 +384,6 @@ public class AuthMePlayerListener implements Listener {
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
// TODO: npc status can be used to bypass security!!!
if (Utils.checkAuth(player) || Utils.isNPC(player)) { if (Utils.checkAuth(player) || Utils.isNPC(player)) {
return; return;
} }
@ -395,7 +394,6 @@ public class AuthMePlayerListener implements Listener {
public void onPlayerConsumeItem(PlayerItemConsumeEvent event) { public void onPlayerConsumeItem(PlayerItemConsumeEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
// TODO: npc status can be used to bypass security!!!
if (Utils.checkAuth(player) || Utils.isNPC(player)) { if (Utils.checkAuth(player) || Utils.isNPC(player)) {
return; return;
} }
@ -406,7 +404,6 @@ public class AuthMePlayerListener implements Listener {
public void onPlayerInventoryOpen(InventoryOpenEvent event) { public void onPlayerInventoryOpen(InventoryOpenEvent event) {
final Player player = (Player) event.getPlayer(); final Player player = (Player) event.getPlayer();
// TODO: npc status can be used to bypass security!!!
if (Utils.checkAuth(player) || Utils.isNPC(player)) { if (Utils.checkAuth(player) || Utils.isNPC(player)) {
return; return;
} }
@ -432,8 +429,6 @@ public class AuthMePlayerListener implements Listener {
return; return;
if (Utils.checkAuth((Player) event.getWhoClicked())) if (Utils.checkAuth((Player) event.getWhoClicked()))
return; return;
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC((Player) event.getWhoClicked())) if (Utils.isNPC((Player) event.getWhoClicked()))
return; return;
event.setCancelled(true); event.setCancelled(true);
@ -448,8 +443,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth((Player) damager)) { if (Utils.checkAuth((Player) damager)) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC((Player) damager)) { if (Utils.isNPC((Player) damager)) {
return; return;
} }
@ -461,8 +454,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -474,8 +465,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -487,8 +476,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -500,8 +487,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -513,8 +498,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -536,8 +519,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -560,8 +541,6 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -573,12 +552,9 @@ public class AuthMePlayerListener implements Listener {
if (Utils.checkAuth(event.getPlayer())) { if (Utils.checkAuth(event.getPlayer())) {
return; return;
} }
// TODO: npc status can be used to bypass security!!!
if (Utils.isNPC(event.getPlayer())) { if (Utils.isNPC(event.getPlayer())) {
return; return;
} }
event.setCancelled(true); event.setCancelled(true);
} }
} }