Fixed a few false flags

MSWS · Mar 17, 2019 · 3fd51e4 · 3fd51e4
1 parent f956c7c
commit 3fd51e4
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>AntiCheat</groupId>
-  <artifactId>AntiCheat</artifactId>
+  <groupId>NOPE</groupId>
+  <artifactId>NOPE</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
@@ -19,7 +19,7 @@
         </includes>
       </resource>
     </resources>
-    <finalName>AntiCheat</finalName>
+    <finalName>NOPE</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: NOPE
 main: org.mswsplex.anticheat.msws.NOPE
-version: 1.1.1
+version: 1.1.3
 description: 1.8 Minecraft Anticheat
 commands:
   nope:

diff --git a/pom.xml b/pom.xml
@@ -2,11 +2,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>AntiCheat</groupId>
-	<artifactId>AntiCheat</artifactId>
+	<groupId>NOPE</groupId>
+	<artifactId>NOPE</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<build>
-		<finalName>AntiCheat</finalName>
+		<finalName>NOPE</finalName>
 		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>

diff --git a/src/org/mswsplex/anticheat/checks/combat/AntiKB1.java b/src/org/mswsplex/anticheat/checks/combat/AntiKB1.java
@@ -57,13 +57,18 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
 
 		Location origin = player.getLocation();
 
+		if (plugin.getTPS() < 18)
+			return;
+
 		new BukkitRunnable() {
 			@Override
 			public void run() {
 				double dist = player.getLocation().distanceSquared(origin);
 				if (dist > 0)
 					return;
-				cp.flagHack(AntiKB1.this, 10);
+				if (plugin.getTPS() < 15)
+					return;
+				cp.flagHack(AntiKB1.this, 10, "TPS: &e" + plugin.getTPS());
 			}
 		}.runTaskLater(plugin, 5);
 	}

diff --git a/src/org/mswsplex/anticheat/checks/combat/KillAura5.java b/src/org/mswsplex/anticheat/checks/combat/KillAura5.java
@@ -48,7 +48,10 @@ public void onEntityDamgedByEntity(EntityDamageByEntityEvent event) {
 
 		if (diff == 0)
 			return;
-
+
+		if (plugin.getTPS() < 18)
+			return;
+
 		cp.flagHack(this, (int) Math.round(diff * 5) + 20, "Invalid Packet Diff: &e" + diff);
 	}
 
@@ -69,7 +72,6 @@ public boolean lagBack() {
 
 	@Override
 	public boolean onlyLegacy() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 }
diff --git a/src/org/mswsplex/anticheat/checks/tick/Timer1.java b/src/org/mswsplex/anticheat/checks/tick/Timer1.java
@@ -67,8 +67,8 @@ public void onMove(PlayerMoveEvent event) {
 					avg += time;
 				avg /= averageTimings.size();
 
-				if (Math.round(lagTicks - avg) > 5) {
-					cp.flagHack(this, (int) (Math.round(lagTicks - avg) - 5) * 3, "&7Lag\n&7 Avg: &e" + avg
+				if (Math.round(lagTicks - avg) > 6) {
+					cp.flagHack(this, (int) (Math.round(lagTicks - avg) - 5) * 2, "&7Lag\n&7 Avg: &e" + avg
 							+ "\n&7 Current: &e" + lagTicks + "\n\n&7TPS: &e" + plugin.getTPS());
 				}
 			}
@@ -98,7 +98,7 @@ public String getDebugName() {
 
 	@Override
 	public boolean lagBack() {
-		return true;
+		return false;
 	}
 
 	@Override

diff --git a/src/org/mswsplex/anticheat/data/CPlayer.java b/src/org/mswsplex/anticheat/data/CPlayer.java
@@ -355,17 +355,17 @@ public void flagHack(Check check, int vl, String debug) {
 			MSG.tell("nope.message.banwave", message);
 			MSG.sendPluginMessage(null, "perm:anticheat.message.banwave " + message);
 			addLogMessage("");
-			addLogMessage("BANWAVE check:" + check.getDebugName() + " VL: " + (nVl - vl) + " (+" + vl + ") time:"
-					+ System.currentTimeMillis());
+			addLogMessage("BANWAVE check:" + check.getDebugName() + " VL: " + (nVl - vl) + " (+" + vl + ") TPS: "
+					+ plugin.getTPS() + " time:" + System.currentTimeMillis());
 			String token = MSG.genUUID(16);
 			saveLog(check.getCategory(), Timing.BANWAVE, token);
 			setSaveData("isBanwaved", check.getCategory());
 			MSG.sendPluginMessage(null, "banwave:" + player.getName() + " " + check.getCategory());
 			addLogMessage("BANWAVE Log ID: " + token);
 			addLogMessage("");
 		} else {
-			addLogMessage("Flagged check:" + check.getDebugName() + " VL: " + (nVl - vl) + " (+" + vl + ") time:"
-					+ System.currentTimeMillis());
+			addLogMessage("Flagged check:" + check.getDebugName() + " VL: " + (nVl - vl) + " (+" + vl + ") TPS: "
+					+ plugin.getTPS() + " time:" + System.currentTimeMillis());
 		}
 
 		if (nVl >= plugin.config.getInt("VlForInstaBan"))

diff --git a/src/org/mswsplex/anticheat/scoreboard/SBoard.java b/src/org/mswsplex/anticheat/scoreboard/SBoard.java
@@ -31,14 +31,14 @@ public SBoard(NOPE plugin) {
 
 		vlRankings = new ArrayList<>();
 
-		name = "&4&lNOPE&c&l Violations";
+		name = "&c&lViolations";
 
 		register();
 	}
 
 	private List<String> vlRankings;
 
-	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) {
+	public <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) {
 		List<Entry<K, V>> list = new ArrayList<>(map.entrySet());
 		list.sort(Entry.comparingByValue());
 
@@ -172,10 +172,6 @@ private void refresh(Player player) {
 			boolean keep = false;
 			if (vlRankings.contains(res))
 				keep = true;
-			// for (String line : vlRankings) {
-//				if (parse(player, res).equals(parse(player, line)))
-//					keep = true;
-//			}
 			if (!keep)
 				board.resetScores(res);
 		}