mirror of
https://github.com/NoCheatPlus/NoCheatPlus.git
synced 2024-09-19 10:21:27 +02:00
Copy+Paste errors fixed + renaming of files to match module names
This commit is contained in:
parent
e83984d2ce
commit
78c264d726
@ -3,5 +3,5 @@ name: NoCheatPlugin
|
|||||||
author: Evenprime
|
author: Evenprime
|
||||||
|
|
||||||
main: cc.co.evenprime.bukkit.nocheat.NoCheatPlugin
|
main: cc.co.evenprime.bukkit.nocheat.NoCheatPlugin
|
||||||
version: 0.6b
|
version: 0.6c
|
||||||
|
|
||||||
|
@ -167,18 +167,18 @@ public class NoCheatPlugin extends JavaPlugin {
|
|||||||
// LOGGING IF NEEDED AND WHERE NEEDED
|
// LOGGING IF NEEDED AND WHERE NEEDED
|
||||||
Level logLevel = null;
|
Level logLevel = null;
|
||||||
|
|
||||||
if(NoCheatConfiguration.movingActionMinor.contains("loglow")) {
|
if(actions.contains("loglow")) {
|
||||||
logLevel = Level.INFO;
|
logLevel = Level.INFO;
|
||||||
}
|
}
|
||||||
if(NoCheatConfiguration.movingActionMinor.contains("logmed")) {
|
if(actions.contains("logmed")) {
|
||||||
logLevel = Level.WARNING;
|
logLevel = Level.WARNING;
|
||||||
}
|
}
|
||||||
if(NoCheatConfiguration.movingActionMinor.contains("loghigh")) {
|
if(actions.contains("loghigh")) {
|
||||||
logLevel = Level.SEVERE;
|
logLevel = Level.SEVERE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(logLevel != null) {
|
if(logLevel != null) {
|
||||||
NoCheatPlugin.log(logLevel, message);
|
NoCheatPlugin.log(logLevel, "NC: "+message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -15,7 +15,7 @@ import cc.co.evenprime.bukkit.nocheat.NoCheatPlugin;
|
|||||||
* @author Evenprime
|
* @author Evenprime
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class BlockPlacingCheck {
|
public class AirbuildCheck {
|
||||||
|
|
||||||
|
|
||||||
public static void check(BlockPlaceEvent event) {
|
public static void check(BlockPlaceEvent event) {
|
@ -9,7 +9,7 @@ import org.bukkit.inventory.PlayerInventory;
|
|||||||
|
|
||||||
import cc.co.evenprime.bukkit.nocheat.NoCheatPlugin;
|
import cc.co.evenprime.bukkit.nocheat.NoCheatPlugin;
|
||||||
|
|
||||||
public class DupePrevention {
|
public class DupebydeathCheck {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Explicitly remove all items that are going to be dropped from the players inventory
|
* Explicitly remove all items that are going to be dropped from the players inventory
|
||||||
@ -32,6 +32,7 @@ public class DupePrevention {
|
|||||||
PlayerInventory playerInventory = p.getInventory();
|
PlayerInventory playerInventory = p.getInventory();
|
||||||
List<ItemStack> drops = event.getDrops();
|
List<ItemStack> drops = event.getDrops();
|
||||||
|
|
||||||
|
// Go through the "to-be-dropped" items and delete the corresponding items from the players inventory
|
||||||
for(ItemStack drop : drops) {
|
for(ItemStack drop : drops) {
|
||||||
for(int i = 0; i < playerInventory.getSize(); i++) {
|
for(int i = 0; i < playerInventory.getSize(); i++) {
|
||||||
if(playerInventory.getItem(i).equals(drop)) {
|
if(playerInventory.getItem(i).equals(drop)) {
|
@ -303,14 +303,16 @@ public class MovingCheck {
|
|||||||
*/
|
*/
|
||||||
private static void action(PlayerMoveEvent event, String actions) {
|
private static void action(PlayerMoveEvent event, String actions) {
|
||||||
|
|
||||||
|
if(actions == null) return;
|
||||||
// LOGGING IF NEEDED
|
// LOGGING IF NEEDED
|
||||||
|
if(actions.contains("log")) {
|
||||||
NoCheatPlugin.logAction(actions, "Moving violation: "+event.getPlayer().getName()+" from " + String.format("(%.5f, %.5f, %.5f) to (%.5f, %.5f, %.5f)", event.getFrom().getX(), event.getFrom().getY(), event.getFrom().getZ(), event.getTo().getX(), event.getTo().getY(), event.getTo().getZ()));
|
NoCheatPlugin.logAction(actions, "Moving violation: "+event.getPlayer().getName()+" from " + String.format("(%.5f, %.5f, %.5f) to (%.5f, %.5f, %.5f)", event.getFrom().getX(), event.getFrom().getY(), event.getFrom().getZ(), event.getTo().getX(), event.getTo().getY(), event.getTo().getZ()));
|
||||||
|
|
||||||
// RESET IF NEEDED
|
|
||||||
if(NoCheatConfiguration.movingActionMinor.contains("reset")) {
|
|
||||||
resetPlayer(event);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RESET IF NEEDED
|
||||||
|
if(actions.contains("reset")) {
|
||||||
|
resetPlayer(event);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -46,15 +46,12 @@ public class SpeedhackCheck {
|
|||||||
else if(data.speedhackEventsSinceLastCheck > limitMed) action = NoCheatConfiguration.speedhackActionNormal;
|
else if(data.speedhackEventsSinceLastCheck > limitMed) action = NoCheatConfiguration.speedhackActionNormal;
|
||||||
else if(data.speedhackEventsSinceLastCheck > limitLow) action = NoCheatConfiguration.speedhackActionMinor;
|
else if(data.speedhackEventsSinceLastCheck > limitLow) action = NoCheatConfiguration.speedhackActionMinor;
|
||||||
|
|
||||||
if(action != null) {
|
if(action == null) {
|
||||||
if(data.speedhackSetBackPoint == null) {
|
|
||||||
data.speedhackSetBackPoint = event.getFrom().clone();
|
data.speedhackSetBackPoint = event.getFrom().clone();
|
||||||
}
|
data.speedhackViolationsInARow = 0;
|
||||||
data.speedhackViolationsInARow++;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
data.speedhackViolationsInARow = 0;
|
data.speedhackViolationsInARow++;
|
||||||
data.speedhackSetBackPoint = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(data.speedhackViolationsInARow >= violationsLimit) {
|
if(data.speedhackViolationsInARow >= violationsLimit) {
|
||||||
@ -66,17 +63,19 @@ public class SpeedhackCheck {
|
|||||||
data.speedhackLastCheck = time;
|
data.speedhackLastCheck = time;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data.speedhackEventsSinceLastCheck++;
|
data.speedhackEventsSinceLastCheck++;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void action(String actions, PlayerMoveEvent event, NoCheatData data) {
|
private static void action(String actions, PlayerMoveEvent event, NoCheatData data) {
|
||||||
|
|
||||||
|
if(actions == null) return;
|
||||||
// LOGGING IF NEEDED
|
// LOGGING IF NEEDED
|
||||||
if(actions.contains("log")) {
|
if(actions.contains("log")) {
|
||||||
NoCheatPlugin.logAction(actions, event.getPlayer().getName()+" sent "+ data.speedhackEventsSinceLastCheck + " move events, but only "+NoCheatConfiguration.speedhackLimitLow+ " were allowed. Speedhack?");
|
NoCheatPlugin.logAction(actions, event.getPlayer().getName()+" sent "+ data.speedhackEventsSinceLastCheck + " move events, but only "+NoCheatConfiguration.speedhackLimitLow+ " were allowed. Speedhack?");
|
||||||
}
|
}
|
||||||
// RESET IF NEEDED
|
// RESET IF NEEDED
|
||||||
if(NoCheatConfiguration.movingActionMinor.contains("reset")) {
|
if(actions.contains("reset")) {
|
||||||
resetPlayer(event, data);
|
resetPlayer(event, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ import org.bukkit.event.block.BlockListener;
|
|||||||
import org.bukkit.event.block.BlockPlaceEvent;
|
import org.bukkit.event.block.BlockPlaceEvent;
|
||||||
|
|
||||||
import cc.co.evenprime.bukkit.nocheat.NoCheatConfiguration;
|
import cc.co.evenprime.bukkit.nocheat.NoCheatConfiguration;
|
||||||
import cc.co.evenprime.bukkit.nocheat.checks.BlockPlacingCheck;
|
import cc.co.evenprime.bukkit.nocheat.checks.AirbuildCheck;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle events for all Block related events
|
* Handle events for all Block related events
|
||||||
@ -23,6 +23,6 @@ public class NoCheatBlockListener extends BlockListener {
|
|||||||
public void onBlockPlace(BlockPlaceEvent event) {
|
public void onBlockPlace(BlockPlaceEvent event) {
|
||||||
|
|
||||||
if(!event.isCancelled() && NoCheatConfiguration.airbuildCheckActive)
|
if(!event.isCancelled() && NoCheatConfiguration.airbuildCheckActive)
|
||||||
BlockPlacingCheck.check(event);
|
AirbuildCheck.check(event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack;
|
|||||||
import org.bukkit.inventory.PlayerInventory;
|
import org.bukkit.inventory.PlayerInventory;
|
||||||
|
|
||||||
import cc.co.evenprime.bukkit.nocheat.NoCheatConfiguration;
|
import cc.co.evenprime.bukkit.nocheat.NoCheatConfiguration;
|
||||||
import cc.co.evenprime.bukkit.nocheat.checks.DupePrevention;
|
import cc.co.evenprime.bukkit.nocheat.checks.DupebydeathCheck;
|
||||||
|
|
||||||
public class NoCheatEntityListener extends EntityListener {
|
public class NoCheatEntityListener extends EntityListener {
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ public class NoCheatEntityListener extends EntityListener {
|
|||||||
public void onEntityDeath(EntityDeathEvent event) {
|
public void onEntityDeath(EntityDeathEvent event) {
|
||||||
|
|
||||||
if(NoCheatConfiguration.dupebydeathCheckActive) {
|
if(NoCheatConfiguration.dupebydeathCheckActive) {
|
||||||
DupePrevention.playerDeath(event);
|
DupebydeathCheck.playerDeath(event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user