From db949bcfd1b3abaacc820e427e9b7fbd79bb5dde Mon Sep 17 00:00:00 2001 From: filoghost Date: Sat, 11 Apr 2020 23:42:03 +0200 Subject: [PATCH] Fix ProtocolLib related errors with some plugins --- .../nms/interfaces/NMSManager.java | 4 +--- .../nms/v1_10_R1/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_11_R1/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_12_R1/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_13_R1/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_13_R2/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_8_R1/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_8_R2/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_8_R3/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_9_R1/NmsManagerImpl.java | 12 ++++++++++++ .../nms/v1_9_R2/NmsManagerImpl.java | 12 ++++++++++++ 11 files changed, 121 insertions(+), 3 deletions(-) diff --git a/NMS/Interfaces/src/main/java/com/gmail/filoghost/holographicdisplays/nms/interfaces/NMSManager.java b/NMS/Interfaces/src/main/java/com/gmail/filoghost/holographicdisplays/nms/interfaces/NMSManager.java index dc3df910..cbd43d93 100644 --- a/NMS/Interfaces/src/main/java/com/gmail/filoghost/holographicdisplays/nms/interfaces/NMSManager.java +++ b/NMS/Interfaces/src/main/java/com/gmail/filoghost/holographicdisplays/nms/interfaces/NMSManager.java @@ -38,8 +38,6 @@ public interface NMSManager { public NMSEntityBase getNMSEntityBase(org.bukkit.entity.Entity bukkitEntity); - default org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { - throw new IllegalStateException("Not implemented"); - } + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID); } diff --git a/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java b/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java index 2ed3c799..497e4147 100644 --- a/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java +++ b/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java @@ -134,5 +134,17 @@ public class NmsManagerImpl implements NMSManager { return null; } + + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } } diff --git a/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java b/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java index 01889f59..75e57b15 100644 --- a/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java +++ b/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java @@ -143,5 +143,17 @@ public class NmsManagerImpl implements NMSManager { return null; } + + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } } diff --git a/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java b/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java index 50c34631..fb637cf0 100644 --- a/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java +++ b/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java @@ -144,4 +144,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + } diff --git a/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java b/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java index f8062e63..223b2632 100644 --- a/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java +++ b/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java @@ -156,4 +156,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + } diff --git a/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java b/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java index 35bb4449..ac91b666 100644 --- a/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java +++ b/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java @@ -157,4 +157,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + } diff --git a/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/NmsManagerImpl.java b/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/NmsManagerImpl.java index 930a28ef..1d641a59 100644 --- a/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/NmsManagerImpl.java +++ b/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/NmsManagerImpl.java @@ -141,4 +141,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.a(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + } diff --git a/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java b/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java index fa306a4c..48c8f59d 100644 --- a/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java +++ b/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java @@ -140,4 +140,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.a(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + } diff --git a/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java b/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java index 80d51d24..870b0e89 100644 --- a/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java +++ b/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java @@ -139,5 +139,17 @@ public class NmsManagerImpl implements NMSManager { return null; } + + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.a(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } } diff --git a/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java b/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java index c79a76b9..efd4f7ca 100644 --- a/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java +++ b/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java @@ -135,4 +135,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + } diff --git a/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java b/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java index 4e156f5b..38846878 100644 --- a/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java +++ b/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java @@ -135,4 +135,16 @@ public class NmsManagerImpl implements NMSManager { return null; } + @Override + public org.bukkit.entity.Entity getEntityFromID(org.bukkit.World bukkitWorld, int entityID) { + WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle(); + Entity nmsEntity = nmsWorld.getEntity(entityID); + + if (nmsEntity == null) { + return null; + } + + return nmsEntity.getBukkitEntity(); + } + }