途中抜け、即キル判定

Author: Elic0de

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

@@ -56,14 +56,9 @@ public void run() {
                     new BukkitRunnable() {
                         @Override
                         public void run() {
-                            // TODO コード修正
-                            final Map<UUID, Entity> combatPlayers = EventListener.combatPlayers;
-                            if (combatPlayers.containsKey(uuid)) {
-                                combatPlayers.get(uuid).remove();
-                                combatPlayers.remove(uuid);
-                            }
-                            if (Bukkit.getPlayer(uuid) != null) {
-                                PitPlayerManager.getPitPlayer(Bukkit.getPlayer(uuid))
+                            final Player player = Bukkit.getPlayer(uuid);
+                            if (player != null) {
+                                PitPlayerManager.getPitPlayer(player)
                                     .setLastDamager(null);
                             }
                         }

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

@@ -49,8 +49,6 @@ public EventListener() {
         Bukkit.getPluginManager().registerEvents(this, TheJpsPit.getInstance());
     }
 
-    public static final Map<UUID, Entity> combatPlayers = new HashMap<>();
-
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
         event.setJoinMessage("");
@@ -70,29 +68,16 @@ public void onJoin(PlayerJoinEvent event) {
         if (updateNeeded) {
             plugin.getDatabase().updateUserData(pitPlayer);
         }
-
-        if (combatPlayers.containsKey(player.getUniqueId())) {
-            LivingEntity entity = (LivingEntity) combatPlayers.get(player.getUniqueId());
-            player.setHealth(entity.getHealth());
-            entity.remove();
-        }
     }
 
     @EventHandler
     public void onQuit(PlayerQuitEvent event) {
         event.setQuitMessage(null);
 
         final PitPlayer player = PitPlayerManager.getPitPlayer(event.getPlayer());
-        final UUID uuid = player.getUniqueId();
-        // 直近攻撃や攻撃を受けていたら仮プレイヤーゾンビを召喚させる
+        // 直近攻撃や攻撃を受けていて離脱したらペナルティーとして最後に与えたプレイヤーのキルとする
         if (CombatTagger.isTagged(player.getUniqueId())) {
-            LivingEntity entity = (LivingEntity) player.getPlayer().getWorld().spawnEntity(player.getPlayer().getLocation(), EntityType.ZOMBIE);
-            entity.setMetadata("uuid", new FixedMetadataValue(TheJpsPit.getInstance(), uuid));
-            entity.getWorld().strikeLightningEffect(entity.getLocation());
-            entity.getEquipment().setArmorContents(player.getPlayer().getInventory().getArmorContents());
-            entity.setCustomName(player.getName());
-            entity.setHealth(player.getPlayer().getHealth());
-            combatPlayers.put(uuid, entity);
+            plugin.getGame().death(player);
         }
 
         PitPlayerManager.unregisterUser(player);
@@ -102,48 +87,6 @@ public void onQuit(PlayerQuitEvent event) {
         }
     }
 
-    @EventHandler
-    public void onDeath(EntityDeathEvent event) {
-        final LivingEntity entity = event.getEntity();
-        final Database database = TheJpsPit.getInstance().getDatabase();
-
-        if (entity.getType() != EntityType.ZOMBIE) return;
-        if (entity.hasMetadata("uuid")) {
-            final List<MetadataValue> metadataValues = entity.getMetadata("uuid");
-            for (MetadataValue metadata : metadataValues) {
-                final UUID uuid = (UUID) metadata.value();
-                combatPlayers.get(uuid).remove();
-
-                if (entity.getKiller() != null) {
-                    final Player killer = entity.getKiller();
-                    final PitPlayer player = PitPlayerManager.getPitPlayer(killer);
-                    final Optional<OfflinePitPlayer> vitimOptional = database.getOfflinePitPlayer(uuid);
-
-                    player.increaseKills();
-                    player.increaseXP();
-                    player.increaseStreaks();
-                    player.addReward();
-
-                    TheJpsPit.getInstance().getRatingHelper().initRating(player);
-
-                    vitimOptional.ifPresent(vitim -> {
-                        vitim.increaseDeaths();
-                        vitim.resetStreaks();
-                        TheJpsPit.getInstance().getRatingHelper().initRating(vitim);
-                        database.updateUserData(vitim);
-
-                        player.sendMessage("&b【PIT】%player%を倒しました(KDレート:%rating%)"
-                            .replaceAll("%player%", entity.getCustomName())
-                            .replaceAll("%rating%", vitim.getRating() + "%")
-                        );
-                    });
-                }
-            }
-        }
-        event.getDrops().clear();
-        event.setDroppedExp(0);
-    }
-
     @EventHandler
     public void onConsume(PlayerItemConsumeEvent event) {
         final Player player = event.getPlayer();