Merge pull request #14 from JavaJava19/develop

Develop

Author: Elic0de

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

@@ -62,7 +62,10 @@ public void run() {
                                 combatPlayers.get(uuid).remove();
                                 combatPlayers.remove(uuid);
                             }
-                            PitPlayerManager.getPitPlayer(Bukkit.getPlayer(uuid)).setLastDamager(null);
+                            if (Bukkit.getPlayer(uuid) != null) {
+                                PitPlayerManager.getPitPlayer(Bukkit.getPlayer(uuid))
+                                    .setLastDamager(null);
+                            }
                         }
                     }.runTaskLater(TheJpsPit.getInstance(), delay * 20L);
                 }

src/main/java/com/github/elic0de/thejpspit/util/KillAssistHelper.java

@@ -12,6 +12,8 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
+import static java.lang.Math.round;
+
 public class KillAssistHelper implements Listener {
 
     private HashMap<UUID, HashMap<UUID, Double>> pitPlayers = new HashMap<>();
@@ -31,7 +33,7 @@ public void death(PitPlayer pitPlayer) {
                 final Player player = Bukkit.getPlayer(uuid);
                 if (player == null) continue;
                 final double damaged = pitPlayers.get(pitPlayer.getUniqueId()).get(uuid);
-                final double assistPer = damaged/totalDamage;
+                final double assistPer = round(damaged/totalDamage * 100/ 100);
                 player.spigot().sendMessage(new MineDown("アシストキル [%per%]% %killedPlayer%".replaceAll("%per%", assistPer + "").replaceAll("%killedPlayer%", KillerName)).toComponent());
             }
          }