From 6c8c8a3a296284e1a73e6f00ad72e44f1602bcfd Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Thu, 2 Dec 2021 20:29:18 +0100
Subject: [PATCH 1/2] Introduces a cross-version way to send packets via
 `NMSManager`

---
 .../compatibility/LegacyParticleEffects.java  | 10 +++++++-
 .../com/songoda/core/chat/ChatMessage.java    | 12 ++++------
 .../java/com/songoda/core/nms/NmsManager.java | 24 +++++++++++++++++++
 .../java/com/songoda/core/utils/NMSUtils.java |  5 ++++
 .../com/songoda/core/world/SWorldBorder.java  |  5 ++--
 .../songoda/core/nms/entity/NMSPlayer.java    |  7 ++++++
 .../nms/v1_10_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_11_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_12_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_13_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_13_R2/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_14_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_15_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_16_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_16_R2/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_16_R3/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_17_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_18_R1/entity/NMSPlayerImpl.java    | 13 ++++++++++
 .../nms/v1_8_R1/entity/NMSPlayerImpl.java     | 13 ++++++++++
 .../nms/v1_8_R2/entity/NMSPlayerImpl.java     | 13 ++++++++++
 .../nms/v1_8_R3/entity/NMSPlayerImpl.java     | 13 ++++++++++
 .../nms/v1_9_R1/entity/NMSPlayerImpl.java     | 13 ++++++++++
 .../nms/v1_9_R2/entity/NMSPlayerImpl.java     | 13 ++++++++++
 23 files changed, 273 insertions(+), 11 deletions(-)
 create mode 100644 NMS/NMS-API/src/main/java/com/songoda/core/nms/entity/NMSPlayer.java
 create mode 100644 NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/entity/NMSPlayerImpl.java
 create mode 100644 NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/entity/NMSPlayerImpl.java

diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/LegacyParticleEffects.java b/Compatibility/src/main/java/com/songoda/core/compatibility/LegacyParticleEffects.java
index 7988cb5c..4ca5af2f 100644
--- a/Compatibility/src/main/java/com/songoda/core/compatibility/LegacyParticleEffects.java
+++ b/Compatibility/src/main/java/com/songoda/core/compatibility/LegacyParticleEffects.java
@@ -15,6 +15,8 @@ import java.util.logging.Logger;
 
 /**
  * Particle effects for servers 1.8 and below
+ *
+ * TODO: Needs a recode, this class should not have any advanced logic like NMS magic
  */
 public class LegacyParticleEffects {
     public enum Type {
@@ -124,7 +126,7 @@ public class LegacyParticleEffects {
             mc_entityPlayer_playerConnection = mc_entityPlayerClazz.getDeclaredField("playerConnection");
             mc_playerConnectionClazz = Class.forName("net.minecraft.server." + version + ".PlayerConnection");
             mc_PacketInterface = Class.forName("net.minecraft.server." + version + ".Packet");
-            mc_playerConnection_sendPacket = mc_playerConnectionClazz.getDeclaredMethod("sendPacket", mc_PacketInterface);
+            mc_playerConnection_sendPacket = mc_playerConnectionClazz.getDeclaredMethod(ServerVersion.isServerVersion(ServerVersion.V1_18) ? "a" : "sendPacket", mc_PacketInterface); // FIXME: Doesn't work cross version, use NMSManager#getPlayer() instead
             if (version.startsWith("v1_8")) {
                 // Aren't worrying about anything after 1.8 in this class here
                 mc_EnumParticle = Class.forName("net.minecraft.server." + version + ".EnumParticle");
@@ -244,6 +246,12 @@ public class LegacyParticleEffects {
         }
     }
 
+    // FIXME: Remove this method on next major release
+
+    /**
+     * @deprecated Doesn't work cross version, use NMSManager#getPlayer() instead
+     */
+    @Deprecated
     private static void sendPacket(Object packet, Player to) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         Object cbPlayer = cb_craftPlayer_getHandle.invoke(to);
         Object mcConnection = mc_entityPlayer_playerConnection.get(cbPlayer);
diff --git a/Core/src/main/java/com/songoda/core/chat/ChatMessage.java b/Core/src/main/java/com/songoda/core/chat/ChatMessage.java
index c97d52e0..3c5fee80 100644
--- a/Core/src/main/java/com/songoda/core/chat/ChatMessage.java
+++ b/Core/src/main/java/com/songoda/core/chat/ChatMessage.java
@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.songoda.core.compatibility.ClassMapping;
 import com.songoda.core.compatibility.ServerVersion;
+import com.songoda.core.nms.NmsManager;
 import com.songoda.core.utils.TextUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -234,9 +235,7 @@ public class ChatMessage {
                     packet = mc_PacketPlayOutChat_new.newInstance(mc_IChatBaseComponent_ChatSerializer_a.invoke(null, gson.toJson(textList)));
                 }
 
-                Object cbPlayer = cb_craftPlayer_getHandle.invoke(sender);
-                Object mcConnection = mc_entityPlayer_playerConnection.get(cbPlayer);
-                mc_playerConnection_sendPacket.invoke(mcConnection, packet);
+                NmsManager.getPlayer().sendPacket((Player) sender, packet);
             } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
                 Bukkit.getLogger().log(Level.WARNING, "Problem preparing raw chat packets (disabling further packets)", ex);
                 enabled = false;
@@ -251,7 +250,7 @@ public class ChatMessage {
     private static boolean enabled = ServerVersion.isServerVersionAtLeast(ServerVersion.V1_8);
 
     private static Class<?> mc_ChatMessageType;
-    private static Method mc_IChatBaseComponent_ChatSerializer_a, cb_craftPlayer_getHandle, mc_playerConnection_sendPacket;
+    private static Method mc_IChatBaseComponent_ChatSerializer_a, cb_craftPlayer_getHandle;
     private static Constructor mc_PacketPlayOutChat_new;
     private static Field mc_entityPlayer_playerConnection, mc_chatMessageType_Chat;
 
@@ -263,16 +262,13 @@ public class ChatMessage {
         if (enabled) {
             try {
                 final String version = ServerVersion.getServerVersionString();
-                Class<?> cb_craftPlayerClazz, mc_entityPlayerClazz, mc_playerConnectionClazz, mc_PacketInterface,
+                Class<?> cb_craftPlayerClazz, mc_entityPlayerClazz,
                         mc_IChatBaseComponent, mc_IChatBaseComponent_ChatSerializer, mc_PacketPlayOutChat;
 
                 cb_craftPlayerClazz = ClassMapping.CRAFT_PLAYER.getClazz();
                 cb_craftPlayer_getHandle = cb_craftPlayerClazz.getDeclaredMethod("getHandle");
                 mc_entityPlayerClazz = ClassMapping.ENTITY_PLAYER.getClazz();
                 mc_entityPlayer_playerConnection = mc_entityPlayerClazz.getDeclaredField(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_17) ? "b" : "playerConnection");
-                mc_playerConnectionClazz = ClassMapping.PLAYER_CONNECTION.getClazz();
-                mc_PacketInterface = ClassMapping.PACKET.getClazz();
-                mc_playerConnection_sendPacket = mc_playerConnectionClazz.getDeclaredMethod("sendPacket", mc_PacketInterface);
                 mc_IChatBaseComponent = ClassMapping.I_CHAT_BASE_COMPONENT.getClazz();
                 mc_IChatBaseComponent_ChatSerializer = ClassMapping.I_CHAT_BASE_COMPONENT.getClazz("ChatSerializer");
                 mc_IChatBaseComponent_ChatSerializer_a = mc_IChatBaseComponent_ChatSerializer.getMethod("a", String.class);
diff --git a/Core/src/main/java/com/songoda/core/nms/NmsManager.java b/Core/src/main/java/com/songoda/core/nms/NmsManager.java
index ba22eed9..f98a7058 100644
--- a/Core/src/main/java/com/songoda/core/nms/NmsManager.java
+++ b/Core/src/main/java/com/songoda/core/nms/NmsManager.java
@@ -1,6 +1,7 @@
 package com.songoda.core.nms;
 
 import com.songoda.core.nms.anvil.AnvilCore;
+import com.songoda.core.nms.entity.NMSPlayer;
 import com.songoda.core.nms.nbt.NBTCore;
 import com.songoda.core.nms.world.WorldCore;
 import org.bukkit.Bukkit;
@@ -11,6 +12,7 @@ import java.util.logging.Logger;
 public class NmsManager {
     private static final String serverPackagePath = Bukkit.getServer().getClass().getPackage().getName();
     private static final String serverPackageVersion = serverPackagePath.substring(serverPackagePath.lastIndexOf('.') + 1);
+    private static final NMSPlayer player;
     private static final AnvilCore anvil;
     private static final NBTCore nbt;
     private static final WorldCore world;
@@ -18,86 +20,103 @@ public class NmsManager {
     static {
         switch (serverPackageVersion) {
             case "v1_8_R1":
+                player = new com.songoda.core.nms.v1_8_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_8_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_8_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_8_R1.world.WorldCoreImpl();
                 break;
             case "v1_8_R2":
+                player = new com.songoda.core.nms.v1_8_R2.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_8_R2.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_8_R2.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_8_R2.world.WorldCoreImpl();
                 break;
             case "v1_8_R3":
+                player = new com.songoda.core.nms.v1_8_R3.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_8_R3.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_8_R3.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_8_R3.world.WorldCoreImpl();
                 break;
             case "v1_9_R1":
+                player = new com.songoda.core.nms.v1_9_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_9_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_9_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_9_R1.world.WorldCoreImpl();
                 break;
             case "v1_9_R2":
+                player = new com.songoda.core.nms.v1_9_R2.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_9_R2.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_9_R2.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_9_R2.world.WorldCoreImpl();
                 break;
             case "v1_10_R1":
+                player = new com.songoda.core.nms.v1_10_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_10_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_10_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_10_R1.world.WorldCoreImpl();
                 break;
             case "v1_11_R1":
+                player = new com.songoda.core.nms.v1_11_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_11_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_11_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_11_R1.world.WorldCoreImpl();
                 break;
             case "v1_12_R1":
+                player = new com.songoda.core.nms.v1_12_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_12_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_12_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_12_R1.world.WorldCoreImpl();
                 break;
             case "v1_13_R1":
+                player = new com.songoda.core.nms.v1_13_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_13_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_13_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_13_R1.world.WorldCoreImpl();
                 break;
             case "v1_13_R2":
+                player = new com.songoda.core.nms.v1_13_R2.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_13_R2.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_13_R2.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_13_R2.world.WorldCoreImpl();
                 break;
             case "v1_14_R1":
+                player = new com.songoda.core.nms.v1_14_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_14_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_14_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_14_R1.world.WorldCoreImpl();
                 break;
             case "v1_15_R1":
+                player = new com.songoda.core.nms.v1_15_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_15_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_15_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_15_R1.world.WorldCoreImpl();
                 break;
             case "v1_16_R1":
+                player = new com.songoda.core.nms.v1_16_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_16_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_16_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_16_R1.world.WorldCoreImpl();
                 break;
             case "v1_16_R2":
+                player = new com.songoda.core.nms.v1_16_R2.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_16_R2.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_16_R2.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_16_R2.world.WorldCoreImpl();
                 break;
             case "v1_16_R3":
+                player = new com.songoda.core.nms.v1_16_R3.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_16_R3.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_16_R3.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_16_R3.world.WorldCoreImpl();
                 break;
             case "v1_17_R1":
+                player = new com.songoda.core.nms.v1_17_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_17_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_17_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_17_R1.world.WorldCoreImpl();
                 break;
             case "v1_18_R1":
+                player = new com.songoda.core.nms.v1_18_R1.entity.NMSPlayerImpl();
                 anvil = new com.songoda.core.nms.v1_18_R1.anvil.AnvilCore();
                 nbt = new com.songoda.core.nms.v1_18_R1.nbt.NBTCoreImpl();
                 world = new com.songoda.core.nms.v1_18_R1.world.WorldCoreImpl();
@@ -105,6 +124,7 @@ public class NmsManager {
             default:
                 Logger.getLogger(NmsManager.class.getName()).log(Level.SEVERE, "Failed to load NMS for this server version: version {0} not found", serverPackageVersion);
 
+                player = null;
                 anvil = null;
                 nbt = null;
                 world = null;
@@ -112,6 +132,10 @@ public class NmsManager {
         }
     }
 
+    public static NMSPlayer getPlayer() {
+        return player;
+    }
+
     public static AnvilCore getAnvil() {
         return anvil;
     }
diff --git a/Core/src/main/java/com/songoda/core/utils/NMSUtils.java b/Core/src/main/java/com/songoda/core/utils/NMSUtils.java
index 90f9fed0..91d3e44f 100644
--- a/Core/src/main/java/com/songoda/core/utils/NMSUtils.java
+++ b/Core/src/main/java/com/songoda/core/utils/NMSUtils.java
@@ -66,6 +66,11 @@ public class NMSUtils {
         }
     }
 
+    // FIXME: Remove this method on next major release
+    /**
+     * @deprecated Doesn't work cross version, use NMSManager#getPlayer() instead
+     */
+    @Deprecated
     public static void sendPacket(Player player, Object packet) {
         try {
             Object handle = player.getClass().getMethod("getHandle").invoke(player);
diff --git a/Core/src/main/java/com/songoda/core/world/SWorldBorder.java b/Core/src/main/java/com/songoda/core/world/SWorldBorder.java
index a858c443..686e75cc 100644
--- a/Core/src/main/java/com/songoda/core/world/SWorldBorder.java
+++ b/Core/src/main/java/com/songoda/core/world/SWorldBorder.java
@@ -2,6 +2,7 @@ package com.songoda.core.world;
 
 import com.songoda.core.compatibility.ClassMapping;
 import com.songoda.core.compatibility.ServerVersion;
+import com.songoda.core.nms.NmsManager;
 import com.songoda.core.utils.NMSUtils;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -82,12 +83,12 @@ public class SWorldBorder {
 
             if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_17)) {
                 Object packet = clientboundInitializeBorderPacketConstructor.newInstance(worldBorder);
-                NMSUtils.sendPacket(player, packet);
+                NmsManager.getPlayer().sendPacket(player, packet);
             } else {
                 @SuppressWarnings({"unchecked", "rawtypes"})
                 Object packet = packetPlayOutWorldBorderConstructor.newInstance(worldBorder,
                         Enum.valueOf((Class<Enum>) packetPlayOutWorldBorderEnumClass, "INITIALIZE"));
-                NMSUtils.sendPacket(player, packet);
+                NmsManager.getPlayer().sendPacket(player, packet);
             }
         } catch (InstantiationException | InvocationTargetException | NoSuchMethodException | IllegalAccessException ex) {
             ex.printStackTrace();
diff --git a/NMS/NMS-API/src/main/java/com/songoda/core/nms/entity/NMSPlayer.java b/NMS/NMS-API/src/main/java/com/songoda/core/nms/entity/NMSPlayer.java
new file mode 100644
index 00000000..003ccd57
--- /dev/null
+++ b/NMS/NMS-API/src/main/java/com/songoda/core/nms/entity/NMSPlayer.java
@@ -0,0 +1,7 @@
+package com.songoda.core.nms.entity;
+
+import org.bukkit.entity.Player;
+
+public interface NMSPlayer {
+    void sendPacket(Player p, Object packet);
+}
diff --git a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..18996b07
--- /dev/null
+++ b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_10_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_10_R1.Packet;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..e499b3a3
--- /dev/null
+++ b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_11_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_11_R1.Packet;
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..95c5ff59
--- /dev/null
+++ b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_12_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_12_R1.Packet;
+import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..8a567bdb
--- /dev/null
+++ b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_13_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_13_R1.Packet;
+import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/entity/NMSPlayerImpl.java b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..4e4f2779
--- /dev/null
+++ b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_13_R2.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_13_R2.Packet;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..427e10a4
--- /dev/null
+++ b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_14_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_14_R1.Packet;
+import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..00573fcd
--- /dev/null
+++ b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_15_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_15_R1.Packet;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..33f40eeb
--- /dev/null
+++ b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_16_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_16_R1.Packet;
+import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/entity/NMSPlayerImpl.java b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..7dd0e95b
--- /dev/null
+++ b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_16_R2.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_16_R2.Packet;
+import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/entity/NMSPlayerImpl.java b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..5a94450d
--- /dev/null
+++ b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_16_R3.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_16_R3.Packet;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..5f294633
--- /dev/null
+++ b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_17_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.network.protocol.Packet;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().b.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..ac3699e6
--- /dev/null
+++ b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_18_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.network.protocol.Packet;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().b.a((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..494c450f
--- /dev/null
+++ b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_8_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_8_R1.Packet;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet) packet);
+    }
+}
diff --git a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/entity/NMSPlayerImpl.java b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..a9347248
--- /dev/null
+++ b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_8_R2.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_8_R2.Packet;
+import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet) packet);
+    }
+}
diff --git a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/entity/NMSPlayerImpl.java b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..f710c47f
--- /dev/null
+++ b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_8_R3.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_8_R3.Packet;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/entity/NMSPlayerImpl.java b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..14e795de
--- /dev/null
+++ b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_9_R1.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_9_R1.Packet;
+import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}
diff --git a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/entity/NMSPlayerImpl.java b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/entity/NMSPlayerImpl.java
new file mode 100644
index 00000000..ff36befe
--- /dev/null
+++ b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/entity/NMSPlayerImpl.java
@@ -0,0 +1,13 @@
+package com.songoda.core.nms.v1_9_R2.entity;
+
+import com.songoda.core.nms.entity.NMSPlayer;
+import net.minecraft.server.v1_9_R2.Packet;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class NMSPlayerImpl implements NMSPlayer {
+    @Override
+    public void sendPacket(Player p, Object packet) {
+        ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet<?>) packet);
+    }
+}

From 776ead9870030710a423b8a80f6264c0a6380210 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Thu, 2 Dec 2021 20:30:26 +0100
Subject: [PATCH 2/2] Version 2.6.1

---
 Compatibility/pom.xml                                | 2 +-
 Core/pom.xml                                         | 2 +-
 Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +-
 NMS/NMS-API/pom.xml                                  | 2 +-
 NMS/NMS-v1_10_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_11_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_12_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_13_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_13_R2/pom.xml                             | 2 +-
 NMS/NMS-v1_14_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_15_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_16_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_16_R2/pom.xml                             | 2 +-
 NMS/NMS-v1_16_R3/pom.xml                             | 2 +-
 NMS/NMS-v1_17_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_18_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_8_R1/pom.xml                              | 2 +-
 NMS/NMS-v1_8_R2/pom.xml                              | 2 +-
 NMS/NMS-v1_8_R3/pom.xml                              | 2 +-
 NMS/NMS-v1_9_R1/pom.xml                              | 2 +-
 NMS/NMS-v1_9_R2/pom.xml                              | 2 +-
 pom.xml                                              | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml
index ddf23898..401a353a 100644
--- a/Compatibility/pom.xml
+++ b/Compatibility/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Core/pom.xml b/Core/pom.xml
index 9594dda2..4b743e2d 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java
index 69fadceb..92858491 100644
--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@@ -53,7 +53,7 @@ public class SongodaCore {
     /**
      * @since coreRevision 6
      */
-    private final static String coreVersion = "2.6.0";
+    private final static String coreVersion = "2.6.1";
 
     /**
      * This is specific to the website api
diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml
index ff10e91c..20452fa8 100644
--- a/NMS/NMS-API/pom.xml
+++ b/NMS/NMS-API/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml
index 29759aeb..3762753a 100644
--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml
index 1cf74d9c..d0cc7080 100644
--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml
index 7749ae94..889f5c8f 100644
--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml
index 39e954db..704434d7 100644
--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml
index a95abc5f..d4cb790b 100644
--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml
index 0b39b71d..376f8fda 100644
--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml
index 47a3f796..d0c9a0f6 100644
--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml
index a18af760..fc99a673 100644
--- a/NMS/NMS-v1_16_R1/pom.xml
+++ b/NMS/NMS-v1_16_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml
index 8f6bcce1..18924038 100644
--- a/NMS/NMS-v1_16_R2/pom.xml
+++ b/NMS/NMS-v1_16_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml
index b4a7bffe..3e161d6d 100644
--- a/NMS/NMS-v1_16_R3/pom.xml
+++ b/NMS/NMS-v1_16_R3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml
index c74a354d..60cbc1a2 100644
--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml
index 180e2304..794ff2a5 100644
--- a/NMS/NMS-v1_18_R1/pom.xml
+++ b/NMS/NMS-v1_18_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml
index ea490457..77fc20d6 100644
--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml
index 082bf263..52a6177c 100644
--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml
index 964ac804..6a5279e1 100644
--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml
index 3669e6b7..5f6e7a43 100644
--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml
index 6c6ce13d..16947622 100644
--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index e44a2296..81269a18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.songoda</groupId>
     <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <packaging>pom</packaging>
 
     <!-- Run 'mvn versions:set -DgenerateBackupPoms=false -DnewVersion=X.Y.Z' to update version recursively -->