当たり判定削除

Author: Elic0de

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

@@ -24,8 +24,13 @@
 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 {
 
@@ -35,9 +40,11 @@ public final class TheJpsPit extends JavaPlugin {
     private KillRatingHelper ratingHelper;
     private QueueManager queueManager;
     private QueueTask queueTask;
-
     private List<Hook> hooks = new ArrayList<>();
 
+    private final Scoreboard scoreboard = Bukkit.getScoreboardManager().getNewScoreboard();
+    private final Team team = scoreboard.registerNewTeam("pit");
+
     public static TheJpsPit getInstance() {
         return instance;
     }
@@ -69,6 +76,8 @@ public void onEnable() {
         ratingHelper = new KillRatingHelper(0);
         queueManager = new QueueManager();
 
+        optionScoreboard();
+
         //queueTask = new QueueTask();
 
         getServer().getMessenger()
@@ -104,6 +113,18 @@ public void onEnable() {
         });
     }
 
+    public void addPitTeam(Player player) {
+        team.addEntry(player.getName());
+    }
+
+    public void removePitTeam(Player player) {
+        team.removeEntry(player.getName());
+    }
+
+    private void optionScoreboard() {
+        team.setOption(Option.COLLISION_RULE, OptionStatus.NEVER);
+    }
+
     private void registerCommands() {
         PaperCommandManager commandManager = new PaperCommandManager(this);
 

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

@@ -60,11 +60,7 @@ public void onJoin(PlayerJoinEvent event) {
         }
         // Update the user's name if it has changed
         final PitPlayer pitPlayer = userData.get();
-        boolean updateNeeded = false;
-
-        if (!pitPlayer.getName().equals(player.getName())) {
-            updateNeeded = true;
-        }
+        boolean updateNeeded = !pitPlayer.getName().equals(player.getName());
 
         PitPlayerManager.registerUser(pitPlayer);
         if (updateNeeded) {
@@ -76,6 +72,8 @@ public void onJoin(PlayerJoinEvent event) {
             player.setHealth(entity.getHealth());
             entity.remove();
         }
+        plugin.addPitTeam(player.getPlayer());
+
     }
 
     @EventHandler
@@ -100,6 +98,7 @@ public void onQuit(PlayerQuitEvent event) {
         if (player.getBoard() != null) {
             player.getBoard().delete();
         }
+        plugin.removePitTeam(player.getPlayer());
     }
 
     @EventHandler