当たり判定を削除

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java

@@ -31,13 +31,10 @@
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scoreboard.Scoreboard;
-import org.bukkit.scoreboard.Team;
-import org.bukkit.scoreboard.Team.Option;
-import org.bukkit.scoreboard.Team.OptionStatus;
+
+
 
 public final class TheJpsPit extends JavaPlugin {
 
@@ -51,8 +48,6 @@ public final class TheJpsPit extends JavaPlugin {
     private QueueTask queueTask;
     private List<Hook> hooks = new ArrayList<>();
 
-    private Scoreboard scoreboard;
-    private Team team;
     private Optional<PitPreferences> pitPreferences;
 
     private PacketManager packetManager;
@@ -89,7 +84,6 @@ public void onEnable() {
         ratingHelper = new KillRatingHelper(0);
         queueManager = new QueueManager();
 
-        optionScoreboard();
         setPreferences();
         setPacketManager();
 
@@ -131,19 +125,6 @@ public void onEnable() {
         });
     }
 
-    public void addPitTeam(Player player) {
-        team.addEntry(player.getName());
-    }
-
-    public void removePitTeam(Player player) {
-        team.removeEntry(player.getName());
-    }
-
-    private void optionScoreboard() {
-        scoreboard = Bukkit.getScoreboardManager().getNewScoreboard();
-        team = scoreboard.registerNewTeam("pit");
-        team.setOption(Option.COLLISION_RULE, OptionStatus.NEVER);
-    }
 
     private void setPreferences() {
         final Optional<PitPreferences> preferences = database.getPitPreferences();

src/main/java/com/github/elic0de/thejpspit/game/Game.java

@@ -24,15 +24,13 @@ public void join(PitPlayer player) {
         pitPlayers.add(player);
         player.addItem();
         player.getBoard().updateLines();
-        pit.addPitTeam(player.getPlayer());
         player.updateDisplayName();
         player.setLastDamager(null);
     }
 
     public void leave(PitPlayer player) {
         pit.getDatabase().updateUserData(player);
         pitPlayers.remove(player);
-        pit.removePitTeam(player.getPlayer());
     }
 
     public void death(PitPlayer player) {

src/main/java/com/github/elic0de/thejpspit/listener/EventListener.java

@@ -2,6 +2,7 @@
 
 import com.github.elic0de.thejpspit.TheJpsPit;
 import com.github.elic0de.thejpspit.gui.ServerQueueMenu;
+import com.github.elic0de.thejpspit.nms.PacketManager;
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.github.elic0de.thejpspit.player.PitPlayerManager;
 import java.util.Optional;
@@ -43,6 +44,12 @@ public void onJoin(PlayerJoinEvent event) {
 
         final Player player = event.getPlayer();
         final Optional<PitPlayer> userData = plugin.getDatabase().getPitPlayer(player);
+
+        final PacketManager packetManager = TheJpsPit.getInstance().getPacketManager();
+        Object packet = packetManager.buildScoreboardTeam(player);
+        packetManager.sendPacket(packet, player);
+
+        plugin.getPitPreferences().ifPresent(pitPreferences -> player.teleport(pitPreferences.getSpawn().orElse(player.getLocation())));
         if (userData.isEmpty()) {
             plugin.getDatabase().createPitPlayer(player);
             PitPlayerManager.registerUser(new PitPlayer(player));
@@ -56,7 +63,6 @@ public void onJoin(PlayerJoinEvent event) {
         if (updateNeeded) {
             plugin.getDatabase().updateUserData(pitPlayer);
         }
-        plugin.getPitPreferences().ifPresent(pitPreferences -> player.teleport(pitPreferences.getSpawn().orElse(player.getLocation())));
     }
 
     @EventHandler

src/main/java/com/github/elic0de/thejpspit/nms/PacketManager.java

@@ -78,6 +78,9 @@ public interface PacketManager {
     @NotNull
     Object buildEntityArmorStand(@NotNull Location location, @NotNull String name) throws IllegalArgumentException;
 
+    @NotNull
+    Object buildScoreboardTeam(@NotNull Player player) throws IllegalArgumentException;
+
     /**
      * Queues a new packet in the packet queue of a player.
      * This method will not flush the packet queue, the passed packet will hence be published to the player in the next

src/main/java/com/github/elic0de/thejpspit/nms/PacketManager1_19_R1.java

@@ -1,28 +1,35 @@
 package com.github.elic0de.thejpspit.nms;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.UUID;
 import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
 import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
+import net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam;
 import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
 import net.minecraft.network.syncher.DataWatcher;
 import net.minecraft.server.level.WorldServer;
 import net.minecraft.world.entity.EntityLiving;
 import net.minecraft.world.entity.decoration.EntityArmorStand;
+import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.world.scores.ScoreboardTeam;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
 /**
  * Implementation of the packet manager for the 1.19 minecraft java version.
  * The implementation uses a mixture of direct calls against the re-obfuscated server internals and reflection.
  */
 public final class PacketManager1_19_R1 implements PacketManager {
 
+    private final Class<?> scoreboardClass;
     private final Method entityGetIdMethod;
     private final Method entityGetDataWatcherMethod;
     private final Method entityGetHandleMethod;
@@ -32,13 +39,15 @@ public final class PacketManager1_19_R1 implements PacketManager {
 
     private final Field entityPlayerPlayerConnectionField;
 
-    public PacketManager1_19_R1(final @NotNull Method entityGetIdMethod,
+    public PacketManager1_19_R1(final @NotNull Class scoreboardClass,
+        final @NotNull Method entityGetIdMethod,
         final @NotNull Method entityGetDataWatcherMethod,
         final @NotNull Method entityGetHandleMethod,
         final @NotNull Method entityGetBukkitEntityMethod,
         final @NotNull Method worldGetHandleMethod,
         final @NotNull Method playerConnectionSendPacketMethod,
         final @NotNull Field entityPlayerPlayerConnectionField) {
+        this.scoreboardClass = scoreboardClass;
         this.entityGetIdMethod = entityGetIdMethod;
         this.entityGetDataWatcherMethod = entityGetDataWatcherMethod;
         this.entityGetHandleMethod = entityGetHandleMethod;
@@ -52,6 +61,7 @@ public PacketManager1_19_R1(final @NotNull Method entityGetIdMethod,
     public static PacketManager1_19_R1 make() {
         try {
             return new PacketManager1_19_R1(
+                getMojangClass("network.protocol.game.PacketPlayOutScoreboardTeam"),
                 getMojangClass("world.entity.Entity").getMethod("ae"),
                 getMojangClass("world.entity.Entity").getMethod("ai"),
                 getCBClass("entity.CraftEntity").getMethod("getHandle"),
@@ -83,6 +93,29 @@ public Object buildEntitySpawnPacket(@NotNull Object entity) {
         return new PacketPlayOutSpawnEntity((EntityLiving) entity);
     }
 
+    @NotNull
+    @Override
+    public Object buildScoreboardTeam(Player player) {
+        try {
+            final Scoreboard scoreboard = new Scoreboard();
+            final ScoreboardTeam scoreboardTeam = new ScoreboardTeam(scoreboard, UUID.randomUUID().toString().substring(0, 15));
+            final PacketPlayOutScoreboardTeam.b packetPlayOutScoreTeamB  = new PacketPlayOutScoreboardTeam.b(scoreboardTeam);
+            final Constructor<?> sc = getConstructor(scoreboardClass, 4);
+            final Field collisionRule = packetPlayOutScoreTeamB.getClass().getDeclaredField("e");
+
+            sc.setAccessible(true);
+            collisionRule.setAccessible(true);
+            collisionRule.set(packetPlayOutScoreTeamB, "never");
+            return sc.newInstance("", 0, Optional.of(packetPlayOutScoreTeamB), Arrays.asList(player.getName()));
+        } catch (final ReflectiveOperationException e) {
+            throw new NMSAccessException("Failed to create entity metadata packet", e);
+        }
+    }
+
+    private Constructor<?> getConstructor(Class<?> clazz, int numParams) {
+        return Arrays.stream((Constructor[])clazz.getDeclaredConstructors()).filter(constructor -> (constructor.getParameterCount() == numParams)).findFirst().orElse(null);
+    }
+
     @NotNull
     @Override
     public Object buildEntityMetadataPacket(@NotNull Object entity, boolean forceUpdateAll) {