From dfedd265d5d8d5da3e6af303502180bf586d9f57 Mon Sep 17 00:00:00 2001
From: Stefatorus <stefanluciandeleanu@gmail.com>
Date: Thu, 23 Dec 2021 03:14:31 +0200
Subject: [PATCH] Updated to 2.27.0

---
 .classpath                                              | 2 +-
 plugin.yml                                              | 2 +-
 src/com/entryrise/lagassist/packets/PacketInjector.java | 2 +-
 src/com/entryrise/lagassist/stacker/StackManager.java   | 3 ++-
 src/com/entryrise/lagassist/utils/VersionMgr.java       | 6 +++++-
 target/classes/.gitignore                               | 1 -
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.classpath b/.classpath
index de8a4ab..cb4d22a 100644
--- a/.classpath
+++ b/.classpath
@@ -15,6 +15,6 @@
 	<classpathentry kind="lib" path="W:/Minecraft Versions/Paper-1.12.2-b1618.jar"/>
 	<classpathentry kind="lib" path="W:/Minecraft Versions/PaperSpigot-1.8.8-R0.1-SNAPSHOT-latest.jar"/>
 	<classpathentry kind="lib" path="W:/Custom Plugins/Vault.jar"/>
-	<classpathentry kind="lib" path="W:/Minecraft Versions/spigot-1.16.4.jar"/>
+	<classpathentry kind="lib" path="W:/Minecraft Versions/spigot-1.18.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugin.yml b/plugin.yml
index d7154b0..5195d10 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: LagAssist
 authors: [Stefatorus, EntryRise]
-version: 2.26.0
+version: 2.27.0
 api-version: 1.13
 description: LagAssist is an advanced anti-lag solution that allows server owners find and remove lag using multiple advanced and efficient methods.
 main: com.entryrise.lagassist.Main
diff --git a/src/com/entryrise/lagassist/packets/PacketInjector.java b/src/com/entryrise/lagassist/packets/PacketInjector.java
index 1a22d92..9761038 100644
--- a/src/com/entryrise/lagassist/packets/PacketInjector.java
+++ b/src/com/entryrise/lagassist/packets/PacketInjector.java
@@ -26,7 +26,7 @@ public class PacketInjector {
 			PacketInjector.playerConnection = Reflection.getClass(VersionMgr.isV_17Plus() ? "{nms}.level.EntityPlayer" : "{nms}.EntityPlayer").getField(VersionMgr.isV_17Plus() ? "b" : "playerConnection");
 			PacketInjector.networkManager = Reflection.getClass(VersionMgr.isV_17Plus() ? "{nms}.network.PlayerConnection" : "{nms}.PlayerConnection").getField(VersionMgr.isV_17Plus() ? "a" : "networkManager");
 
-			PacketInjector.channel = Reflection.getClass(VersionMgr.isV1_17() ? "{nm}.network.NetworkManager" : "{nms}.NetworkManager").getField(VersionMgr.isV1_17() ? "k" : "channel");
+			PacketInjector.channel = Reflection.getClass(VersionMgr.isV_17Plus() ? "{nm}.network.NetworkManager" : "{nms}.NetworkManager").getField(VersionMgr.isV_17Plus() ? "k" : "channel");
 
 			PacketInjector.refreshSessions();
 		} catch (Exception e) {
diff --git a/src/com/entryrise/lagassist/stacker/StackManager.java b/src/com/entryrise/lagassist/stacker/StackManager.java
index 7ea9c3c..6acc5b5 100644
--- a/src/com/entryrise/lagassist/stacker/StackManager.java
+++ b/src/com/entryrise/lagassist/stacker/StackManager.java
@@ -111,7 +111,8 @@ public class StackManager implements Listener {
 //		}
 		
 		if (StackChunk.tryStacking(ent.getLocation(), ent.getType(), ent)) {
-			e.setCancelled(true);
+//			e.setCancelled(true);
+			ent.remove();
 		}
 	}
 
diff --git a/src/com/entryrise/lagassist/utils/VersionMgr.java b/src/com/entryrise/lagassist/utils/VersionMgr.java
index e14f320..774565d 100644
--- a/src/com/entryrise/lagassist/utils/VersionMgr.java
+++ b/src/com/entryrise/lagassist/utils/VersionMgr.java
@@ -62,8 +62,12 @@ public class VersionMgr {
 		return Bukkit.getVersion().contains("1.17");
 	}
 	
+	public static boolean isV1_18() {
+		return Bukkit.getVersion().contains("1.18");
+	}
+	
 	public static boolean isV_17Plus() {
-		return isV1_17();
+		return isV1_17() || isV1_18();
 	}
 	
 	public static boolean isNewMaterials() {
diff --git a/target/classes/.gitignore b/target/classes/.gitignore
index 91520de..c2d9872 100644
--- a/target/classes/.gitignore
+++ b/target/classes/.gitignore
@@ -1,2 +1 @@
-/cx/
 /com/