Merge pull request #10 from JavaJava19/develop

Develop

Author: Elic0de

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

@@ -4,9 +4,10 @@
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.github.elic0de.thejpspit.scoreboard.GameScoreboard;
 import com.github.elic0de.thejpspit.task.GameTask;
-import com.github.elic0de.thejpspit.util.killAssistHelper.KillAssistHelper;
+import de.themoep.minedown.MineDown;
 import java.util.HashSet;
 import java.util.Set;
+import org.bukkit.entity.Player;
 
 public class Game {
 
@@ -68,6 +69,14 @@ public void death(PitPlayer player) {
         //KillAssistHelper.test(player.getPlayer());
     }
 
+    public void broadcast(String message) {
+        for (PitPlayer pitPlayer : getPitPlayers()) {
+            final Player player = pitPlayer.getPlayer();
+
+            player.spigot().sendMessage(new MineDown(message).toComponent());
+        }
+    }
+
     public Set<PitPlayer> getPitPlayers() {
         return pitPlayers;
     }

src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java

@@ -206,7 +206,10 @@ public void increaseKills() {
 
     public void increaseStreaks() {
         this.streaks ++;
-        if (bestStreaks > streaks) {
+
+        if (streaks % 5 == 0) TheJpsPit.getInstance().getGame().broadcast(player.getName() + "&aが連続で&c" + streaks + "&aキルしています！" );
+
+        if (bestStreaks < streaks) {
             this.bestStreaks = streaks;
         }
     }
@@ -221,7 +224,7 @@ public void increaseXP() {
 
     public void increaseHealth() {
         player.setHealth(Math.min(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(),
-            player.getHealth() + 2));
+            player.getHealth() + 4));
     }
 
     public void resetStreaks() {