Merge pull request #13 from JavaJava19/develop

Elic0de · web-flow · commit 36c2b3144454 · 2023-01-16T21:03:07.000+09:00
Develop
diff --git a/src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java b/src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java
@@ -155,7 +155,6 @@ private void updateXpBar() {
         final int level = Levels.getPlayerLevel(this);
         player.setLevel(level);
         player.setExp((neededXp - xp)/neededXp);
-        System.out.println(xp + ":" + neededXp);
     }
 
     public void updateDisplayName() {
diff --git a/src/main/java/com/github/elic0de/thejpspit/util/KillAssistHelper.java b/src/main/java/com/github/elic0de/thejpspit/util/KillAssistHelper.java
@@ -29,7 +29,7 @@ public void death(PitPlayer pitPlayer) {
             }
             for (UUID uuid : pitPlayers.get(pitPlayer.getUniqueId()).keySet()) {
                 final Player player = Bukkit.getPlayer(uuid);
-                if (!player.isOnline()) continue;
+                if (player == null) continue;
                 final double damaged = pitPlayers.get(pitPlayer.getUniqueId()).get(uuid);
                 final double assistPer = damaged/totalDamage;
                 player.spigot().sendMessage(new MineDown("アシストキル [%per%]% %killedPlayer%".replaceAll("%per%", assistPer + "").replaceAll("%killedPlayer%", KillerName)).toComponent());

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,6 @@ private void updateXpBar() {`
`155`	`155`	`final int level = Levels.getPlayerLevel(this);`
`156`	`156`	`player.setLevel(level);`
`157`	`157`	`player.setExp((neededXp - xp)/neededXp);`
`158`		`- System.out.println(xp + ":" + neededXp);`
`159`	`158`	`}`
`160`	`159`
`161`	`160`	`public void updateDisplayName() {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void death(PitPlayer pitPlayer) {`
`29`	`29`	`}`
`30`	`30`	`for (UUID uuid : pitPlayers.get(pitPlayer.getUniqueId()).keySet()) {`
`31`	`31`	`final Player player = Bukkit.getPlayer(uuid);`
`32`		`- if (!player.isOnline()) continue;`
	`32`	`+ if (player == null) continue;`
`33`	`33`	`final double damaged = pitPlayers.get(pitPlayer.getUniqueId()).get(uuid);`
`34`	`34`	`final double assistPer = damaged/totalDamage;`
`35`	`35`	`player.spigot().sendMessage(new MineDown("アシストキル [%per%]% %killedPlayer%".replaceAll("%per%", assistPer + "").replaceAll("%killedPlayer%", KillerName)).toComponent());`