Merge branch 'master' into standalone

FightSystem_8/src/de/steamwar/fightsystem/utils/FlatteningWrapper8.java

@@ -72,7 +72,7 @@ public class FlatteningWrapper8 implements FlatteningWrapper.IFlatteningWrapper
 
     @Override
     public void forceLoadChunk(World world, int cX, int cZ) {
-        // not possible in 1.8
+        world.setKeepSpawnInMemory(true);
     }
 
     @Override

FightSystem_9/src/de/steamwar/fightsystem/utils/BountifulWrapper9.java

@@ -100,7 +100,7 @@ public class BountifulWrapper9 implements BountifulWrapper.IBountifulWrapper {
     @Override
     public Listener newHandSwapRecorder() {
         return new Listener() {
-            @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+            @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
             public void onItemSwap(PlayerSwapHandItemsEvent e){
                 if(Recording.isNotSent(e.getPlayer()))
                     return;

FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java

@@ -40,7 +40,7 @@ public enum ArenaMode {
     public static final Set<ArenaMode> Test = Collections.unmodifiableSet(EnumSet.of(TEST, CHECK));
     public static final Set<ArenaMode> Ranked = Collections.unmodifiableSet(EnumSet.of(RANKED));
     public static final Set<ArenaMode> Prepare = Collections.unmodifiableSet(EnumSet.of(PREPARE));
-    public static final Set<ArenaMode> Replay = Collections.unmodifiableSet(EnumSet.of(REPLAY));
+    public static final Set<ArenaMode> Replay = Collections.unmodifiableSet(EnumSet.of(REPLAY, TEST));
 
     public static final Set<ArenaMode> AntiReplay = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(REPLAY)));
     public static final Set<ArenaMode> AntiTest = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(TEST, CHECK)));

FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java

@@ -148,6 +148,7 @@ public class FightSystem extends JavaPlugin {
         new FileRecorder();
 
         REntity.initWatchers();
+        FileSource.startReplay();
 
         if(Config.mode == ArenaMode.EVENT) {
             setPreSchemState();
@@ -155,9 +156,6 @@ public class FightSystem extends JavaPlugin {
             Fight.getBlueTeam().setSchem(SchematicNode.getSchematicNode(Config.CheckSchemID));
         }else if(Config.mode == ArenaMode.PREPARE) {
             Fight.getUnrotated().setSchem(SchematicNode.getSchematicNode(Config.PrepareSchemID));
-        }else if(Config.mode == ArenaMode.REPLAY) {
-            FightWorld.forceLoad();
-            FileSource.startReplay();
         }
     }
 

FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java

@@ -27,7 +27,6 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.record.GlobalRecorder;
-import de.steamwar.fightsystem.utils.ProtocolAPI;
 import de.steamwar.fightsystem.utils.ProtocolWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -150,7 +149,7 @@ public class Fight {
     }
 
     public static Object playerInfoPacket(Object action, GameProfile profile, Object mode) {
-        Object packet = ProtocolAPI.construct(playerInfoPacket);
+        Object packet = Reflection.newInstance(playerInfoPacket);
         playerInfoAction.set(packet, action);
         playerInfoData.set(packet, Collections.singletonList(ProtocolWrapper.impl.playerInfoDataConstructor(packet, profile, mode)));
         return packet;

FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java

@@ -61,7 +61,6 @@ public class FightWorld extends StateDependent {
             world.loadChunk(cX, cZ);
             FlatteningWrapper.impl.forceLoadChunk(world, cX, cZ);
         });
-        world.setKeepSpawnInMemory(true);
     }
 
     public static void resetWorld(){

FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java

@@ -20,15 +20,12 @@
 package de.steamwar.fightsystem.listener;
 
 import de.steamwar.fightsystem.ArenaMode;
-import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightPlayer;
-import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FightUI;
 import de.steamwar.fightsystem.utils.SWSound;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -36,41 +33,42 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+import java.util.function.Consumer;
+
 public class IngameDeath implements Listener {
 
     public IngameDeath() {
         new StateDependentListener(ArenaMode.AntiReplay, FightState.Ingame, this);
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler
-    public void handlePlayerDeath(PlayerDeathEvent event) {
+    public void broadcastDeath(PlayerDeathEvent event) {
-        event.setDeathMessage(null);
+        onPlayerEnd(event.getEntity(), fightPlayer -> {
-
+            FightUI.addSubtitle("UI_PLAYER_DEATH", fightPlayer.getTeam().getPrefix(), fightPlayer.getPlayer().getName());
-        Player player = event.getEntity();
-        FightTeam team = Fight.getPlayerTeam(player);
-
-        if(team == null)
-            return;
-
-        FightUI.addSubtitle("UI_PLAYER_DEATH", team.getPrefix(), player.getName());
             Fight.playSound(SWSound.ENTITY_WITHER_DEATH.getSound(), 100.0F, 1.0F);
-        Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> team.getFightPlayer(player).setOut());
+        });
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler
+    public void broadcastQuit(PlayerQuitEvent event) {
+        onPlayerEnd(event.getPlayer(), fightPlayer -> FightUI.addSubtitle("UI_PLAYER_LEAVE", fightPlayer.getTeam().getPrefix(), fightPlayer.getPlayer().getName()));
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void handlePlayerDeath(PlayerDeathEvent event) {
+        onPlayerEnd(event.getEntity(), FightPlayer::setOut);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
     public void handlePlayerQuit(PlayerQuitEvent event) {
-        event.setQuitMessage(null);
+        onPlayerEnd(event.getPlayer(), FightPlayer::setOut);
+    }
 
-        Player player = event.getPlayer();
+    private void onPlayerEnd(Player player, Consumer<FightPlayer> withLivingPlayer) {
-        FightTeam team = Fight.getPlayerTeam(player);
+        FightPlayer fightPlayer = Fight.getFightPlayer(player);
-        if(team == null)
+        if(fightPlayer == null || !fightPlayer.isLiving())
             return;
 
-        FightPlayer fightPlayer = team.getFightPlayer(player);
+        withLivingPlayer.accept(fightPlayer);
-        if(!fightPlayer.isLiving())
-            return;
-
-        FightUI.addSubtitle("UI_PLAYER_LEAVE", team.getPrefix(), player.getName());
-        Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> team.getFightPlayer(player).setOut());
     }
 }

FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -34,6 +34,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.entity.SpawnerSpawnEvent;
 import org.bukkit.event.inventory.CraftItemEvent;
 import org.bukkit.event.inventory.FurnaceSmeltEvent;
@@ -81,7 +82,12 @@ public class Permanent implements Listener {
         REntity.playerJoins(player);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void handlePlayerDeath(PlayerDeathEvent event) {
+        event.setDeathMessage(null);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
     public void handlePlayerLeave(PlayerQuitEvent event) {
         event.setQuitMessage(null);
     }

FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java

@@ -133,7 +133,7 @@ public class Recording implements Listener {
         return packet;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent e){
         if(isNotSent(e.getPlayer()))
             return;
@@ -141,15 +141,12 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().entityMoves(e.getPlayer());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler
     public void onPlayerDeath(PlayerDeathEvent e) {
-        if(isNotSent(e.getEntity()))
-            return;
-
         GlobalRecorder.getInstance().entityDespawns(e.getEntity());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler
     public void onPlayerQuit(PlayerQuitEvent e){
         if(isNotSent(e.getPlayer()))
             return;
@@ -157,13 +154,13 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().entityDespawns(e.getPlayer());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockPhysics(BlockPhysicsEvent e){
         if(FlatteningWrapper.impl.doRecord(e))
             GlobalRecorder.getInstance().blockChange(e.getBlock());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onSneak(PlayerToggleSneakEvent e){
         if(isNotSent(e.getPlayer()))
             return;
@@ -171,7 +168,7 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().playerSneak(e.getPlayer(), e.isSneaking());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onAnimation(PlayerAnimationEvent e){
         if(isNotSent(e.getPlayer()))
             return;
@@ -180,7 +177,7 @@ public class Recording implements Listener {
             GlobalRecorder.getInstance().entityAnimation(e.getPlayer(), AIR);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onEntityDamage(EntityDamageEvent e) {
         if(e.getEntityType() != EntityType.PLAYER)
             return;
@@ -195,7 +192,7 @@ public class Recording implements Listener {
             GlobalRecorder.getInstance().setOnFire(p, false);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onEntityCombust(EntityCombustEvent e) {
         if(e.getEntityType() != EntityType.PLAYER)
             return;
@@ -207,7 +204,7 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().setOnFire(p, false);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onTNTSpawn(EntitySpawnEvent e){
         if(e.getEntityType() != EntityType.PRIMED_TNT)
             return;
@@ -215,7 +212,7 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().tntSpawn(e.getEntity());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onExplosion(EntityExplodeEvent e){
         if(e.getEntityType() != EntityType.PRIMED_TNT)
             return;
@@ -226,7 +223,7 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().sound(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), SWSound.ENTITY_GENERIC_EXPLODE, "BLOCKS", 4.0F, (1.0F + (random.nextFloat() - random.nextFloat()) * 0.2F) * 0.7F);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onItem(PlayerItemHeldEvent e){
         if(isNotSent(e.getPlayer()))
             return;
@@ -234,7 +231,7 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().item(e.getPlayer(), disarmNull(e.getPlayer().getInventory().getItem(e.getNewSlot())), "MAINHAND");
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onProjectileSpawn(ProjectileLaunchEvent e){
         if(e.getEntityType() == EntityType.FIREBALL)
             GlobalRecorder.getInstance().fireballSpawn(e.getEntity());
@@ -242,7 +239,7 @@ public class Recording implements Listener {
             GlobalRecorder.getInstance().arrowSpawn(e.getEntity());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent e){
         Player player = (Player) e.getWhoClicked();
         if(isNotSent(player))

FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java

@@ -25,7 +25,6 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
@@ -35,7 +34,7 @@ public class Shutdown implements Listener {
         new StateDependentListener(ArenaMode.AntiEvent, FightState.All, this);
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler
     public void handlePlayerQuit(PlayerQuitEvent event) {
         if(Config.replayserver())
             return;

FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java

@@ -20,11 +20,13 @@
 package de.steamwar.fightsystem.listener;
 
 import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -41,6 +43,12 @@ public class TestJoin implements Listener {
         Player player = event.getPlayer();
         FightTeam fightTeam = Fight.getPlayerTeam(player);
 
+        if(Config.ReplayID != 0 && !SteamwarUser.get(player.getUniqueId()).getUserGroup().isAdminGroup()) {
+            FightSystem.getMessage().send("CHECK_JOIN_DENIED", player);
+            player.kickPlayer("");
+            return;
+        }
+
         if (fightTeam == null && (Fight.getRedTeam().isLeaderless() || Fight.getBlueTeam().isLeaderless())) {
             FightSystem.getMessage().send("TEST_BECOME_LEADER", player);
         }

FightSystem_Core/src/de/steamwar/fightsystem/record/FileSource.java

@@ -38,6 +38,7 @@ public class FileSource extends PacketSource {
             return;
         }
 
+        if(Config.ReplayID > 0) {
             de.steamwar.sql.Fight.getReplay(Config.ReplayID, input -> {
                 try {
                     Files.copy(
@@ -55,6 +56,7 @@ public class FileSource extends PacketSource {
                 throw new SecurityException("Could not start replay", e);
             }
         }
+    }
 
     public FileSource(File fightFile) throws IOException {
         super(new GZIPInputStream(new FileInputStream(fightFile)));

FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.countdown.Countdown;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.fight.FightWorld;
 import de.steamwar.fightsystem.fight.FreezeWorld;
 import de.steamwar.fightsystem.listener.FightScoreboard;
 import de.steamwar.fightsystem.states.FightState;
@@ -76,6 +77,7 @@ public class PacketProcessor {
     private int arenaMinZ = Config.ArenaRegion.getMinZ();
 
     private boolean tickFinished = false;
+    private int lastPacket = -1;
 
     public PacketProcessor(PacketSource source){
         this.source = source;
@@ -123,6 +125,8 @@ public class PacketProcessor {
         packetDecoder[0xef] = source::readUTF;
         packetDecoder[0xff] = this::tick;
 
+        FightWorld.forceLoad();
+
         if(source.async()) {
             Bukkit.getScheduler().runTaskAsynchronously(FightSystem.getPlugin(), this::process);
             task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::runSync, 1, 1);
@@ -507,15 +511,16 @@ public class PacketProcessor {
                 if(parser != null){
                     parser.process();
                 }else{
-                    Bukkit.getLogger().log(Level.SEVERE, "Unknown packet " + packetType + " recieved, closing.");
+                    Bukkit.getLogger().log(Level.SEVERE, "Unknown packet " + packetType + " recieved, closing. LastPacket: " + lastPacket);
                     source.close();
                 }
+                lastPacket = packetType;
             }
         } catch (EOFException e) {
             Bukkit.getLogger().log(Level.INFO, "The FightServer is offline");
             source.close();
         } catch(Exception e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not recieve packet", e);
+            Bukkit.getLogger().log(Level.WARNING, "Could not recieve packet, LastPacket: " + lastPacket, e);
             source.close();
         }
 

FightSystem_Core/src/de/steamwar/fightsystem/record/REntity.java

@@ -177,7 +177,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Integer> animationEntity = Reflection.getField(animationPacket, int.class, 0);
     private static final Reflection.FieldAccessor<Integer> animationAnimation = Reflection.getField(animationPacket, int.class, 1);
     public void animation(byte animation) {
-        Object packet = ProtocolAPI.construct(animationPacket);
+        Object packet = Reflection.newInstance(animationPacket);
         animationEntity.set(packet, entityId);
         animationAnimation.set(packet, (int) animation);
         ProtocolAPI.broadcastPacket(packet);
@@ -189,7 +189,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Integer> velocityY = Reflection.getField(velocityPacket, int.class, 2);
     private static final Reflection.FieldAccessor<Integer> velocityZ = Reflection.getField(velocityPacket, int.class, 3);
     public void setVelocity(double dX, double dY, double dZ) {
-        Object packet = ProtocolAPI.construct(velocityPacket);
+        Object packet = Reflection.newInstance(velocityPacket);
         velocityEntity.set(packet, entityId);
         velocityX.set(packet, calcVelocity(dX));
         velocityY.set(packet, calcVelocity(dY));
@@ -201,7 +201,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Integer> statusEntity = Reflection.getField(statusPacket, int.class, 0);
     private static final Reflection.FieldAccessor<Byte> statusStatus = Reflection.getField(statusPacket, byte.class, 0);
     public void damage() {
-        Object packet = ProtocolAPI.construct(statusPacket);
+        Object packet = Reflection.newInstance(statusPacket);
         statusEntity.set(packet, entityId);
         statusStatus.set(packet, (byte) 2);
         ProtocolAPI.broadcastPacket(packet);
@@ -259,7 +259,7 @@ public class REntity {
             team.removeEntry(name);
         }
 
-        Object packet = ProtocolAPI.construct(destroyPacket);
+        Object packet = Reflection.newInstance(destroyPacket);
         destroyEntities.set(packet, Core.getVersion() > 15 ? new IntArrayList(new int[]{entityId}) : new int[]{entityId});
         ProtocolAPI.broadcastPacket(packet);
     }
@@ -272,7 +272,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Integer> metadataEntity = Reflection.getField(metadataPacket, int.class, 0);
     private static final Reflection.FieldAccessor<List> metadataMetadata = Reflection.getField(metadataPacket, List.class, 0);
     private Object getDataWatcherPacket(Object dataWatcherObject, Object value) {
-        Object packet = ProtocolAPI.construct(metadataPacket);
+        Object packet = Reflection.newInstance(metadataPacket);
         metadataEntity.set(packet, entityId);
         metadataMetadata.set(packet, Collections.singletonList(BountifulWrapper.impl.getDataWatcherItem(dataWatcherObject, value)));
         return packet;
@@ -283,7 +283,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Byte> teleportYaw = Reflection.getField(teleportPacket, byte.class, 0);
     private static final Reflection.FieldAccessor<Byte> teleportPitch = Reflection.getField(teleportPacket, byte.class, 1);
     private Object getTeleportPacket(){
-        Object packet = ProtocolAPI.construct(teleportPacket);
+        Object packet = Reflection.newInstance(teleportPacket);
         teleportEntity.set(packet, entityId);
         BountifulWrapper.impl.setTeleportPacketPosition(packet, locX, locY, locZ);
         teleportYaw.set(packet, yaw);
@@ -295,7 +295,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Integer> headRotationEntity = Reflection.getField(headRotationPacket, int.class, 0);
     private static final Reflection.FieldAccessor<Byte> headRotationYaw = Reflection.getField(headRotationPacket, byte.class, 0);
     private Object getHeadRotationPacket(){
-        Object packet = ProtocolAPI.construct(headRotationPacket);
+        Object packet = Reflection.newInstance(headRotationPacket);
         headRotationEntity.set(packet, entityId);
         headRotationYaw.set(packet, headYaw);
         return packet;
@@ -304,7 +304,7 @@ public class REntity {
     public static final Class<?> spawnPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutSpawnEntity");
     private static final Reflection.FieldAccessor<Integer> spawnEntity = Reflection.getField(spawnPacket, int.class, 0);
     private Object getSpawnEntityPacket(){
-        Object packet = ProtocolAPI.construct(spawnPacket);
+        Object packet = Reflection.newInstance(spawnPacket);
         spawnEntity.set(packet, entityId);
         BountifulWrapper.impl.setSpawnPacketUUID(packet, uuid);
         ProtocolWrapper.impl.setSpawnPacketType(packet, entityType);
@@ -318,7 +318,7 @@ public class REntity {
     private static final Class<?> craftItemStack = Reflection.getClass("{obc}.inventory.CraftItemStack");
     private static final Reflection.MethodInvoker asNMSCopy = Reflection.getTypedMethod(REntity.craftItemStack, "asNMSCopy", REntity.itemStack, ItemStack.class);
     private Object getEquipmentPacket(String slot, ItemStack stack){
-        Object packet = ProtocolAPI.construct(equipmentPacket);
+        Object packet = Reflection.newInstance(equipmentPacket);
         equipmentEntity.set(packet, entityId);
         ProtocolWrapper.impl.setEquipmentPacketStack(packet, slot, asNMSCopy.invoke(null, stack));
         return packet;
@@ -332,7 +332,7 @@ public class REntity {
     private static final Reflection.FieldAccessor<Integer> namedSpawnEntity = Reflection.getField(namedSpawnPacket, int.class, 0);
     private static final Reflection.FieldAccessor<UUID> namedSpawnUUID = Reflection.getField(namedSpawnPacket, UUID.class, 0);
     private Object getNamedSpawnPacket(){
-        Object packet = ProtocolAPI.construct(namedSpawnPacket);
+        Object packet = Reflection.newInstance(namedSpawnPacket);
         namedSpawnEntity.set(packet, entityId);
         namedSpawnUUID.set(packet, uuid);
         FlatteningWrapper.impl.setNamedSpawnPacketDataWatcher(packet);

FightSystem_Core/src/de/steamwar/fightsystem/utils/ProtocolAPI.java

@@ -19,8 +19,8 @@
 
 package de.steamwar.fightsystem.utils;
 
+import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
-import jdk.internal.misc.Unsafe;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -88,19 +88,11 @@ public class ProtocolAPI {
         };
     }
 
-    public static <T> T construct(Class<T> clazz) {
-        try {
-            return (T) Unsafe.getUnsafe().allocateInstance(clazz);
-        } catch (InstantiationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
     public static UnaryOperator<Object> shallowCloneGenerator(Class<?> clazz) {
         BiConsumer<Object, Object> filler = shallowFill(clazz);
 
         return source -> {
-            Object clone = construct(clazz);
+            Object clone = Reflection.newInstance(clazz);
             filler.accept(source, clone);
             return clone;
         };