Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Outer space again!

Browse Source
This commit is contained in:
asofold 2013-06-07 15:23:40 +02:00
parent d01fa3e8a7
commit 8f862fb3f6
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
View File

@ -79,13 +79,14 @@ public class MCAccessBukkit implements MCAccess, BlockPropertiesSetup{
final Material mat = Material.getMaterial(id);
if (mat == null) return AlmostBoolean.MAYBE;
switch (mat) {
case STATIONARY_LAVA:
case STATIONARY_WATER:
case WATER:
case LAVA:
return AlmostBoolean.YES;
case STATIONARY_LAVA:
case STATIONARY_WATER:
case WATER:
case LAVA:
return AlmostBoolean.YES;
default:
return AlmostBoolean.NO;
}
return AlmostBoolean.NO;
}
@Override

15
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/combined/CombinedConfig.java
View File

@ -141,14 +141,15 @@ public class CombinedConfig extends ACheckConfig {
@Override
public boolean isEnabled(final CheckType checkType) {
switch(checkType){
case COMBINED_IMPROBABLE:
return improbableCheck;
case COMBINED_BEDLEAVE:
return bedLeaveCheck;
case COMBINED_MUNCHHAUSEN:
return munchHausenCheck;
case COMBINED_IMPROBABLE:
return improbableCheck;
case COMBINED_BEDLEAVE:
return bedLeaveCheck;
case COMBINED_MUNCHHAUSEN:
return munchHausenCheck;
default:
return false;
}
return false;
}
public static void clear() {

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
View File

@ -125,19 +125,16 @@ public class NCPExemptionManager {
*/
public static Listener getListener() {
return new NCPListener() {
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerJoin(final PlayerJoinEvent event) {
NCPExemptionManager.registerPlayer(event.getPlayer());
}
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerQuit(final PlayerQuitEvent event) {
NCPExemptionManager.tryToRemove(event.getPlayer());
}
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerKick(final PlayerKickEvent event) {
NCPExemptionManager.tryToRemove(event.getPlayer());

5
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
View File

@ -948,7 +948,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
*/
private Listener getCoreListener() {
return new NCPListener() {
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerLogin(final PlayerLoginEvent event) {
// (NORMAL to have chat checks come after this.)
@ -965,13 +964,11 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
}
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(final PlayerJoinEvent event) {
onJoin(event.getPlayer());
}
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerchangedWorld(final PlayerChangedWorldEvent event)
{
@ -979,13 +976,11 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
updatePermStateReceivers(player);
}
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerKick(final PlayerKickEvent event) {
onLeave(event.getPlayer());
}
@SuppressWarnings("unused")
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerQuitMonitor(final PlayerQuitEvent event) {
onLeave(event.getPlayer());