Skip to content

Commit 8f58939

Browse files
committed
fix:preferenceの更新
1 parent 1daba7e commit 8f58939

3 files changed

Lines changed: 18 additions & 8 deletions

File tree

src/main/java/com/github/elic0de/thejpspit/database/SqLiteDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ public void updatePitPreferences(PitPreferences pitPreferences) {
332332
try (PreparedStatement statement = getConnection().prepareStatement(formatStatementTables("""
333333
UPDATE `%pit_preferences%`
334334
SET `preferences` = ?
335-
LIMIT 1"""))) {
335+
"""))) {
336336
statement.setBytes(2, plugin.getGson().toJson(pitPreferences).getBytes(StandardCharsets.UTF_8));
337337
statement.executeUpdate();
338338
} catch (SQLException e) {

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
import com.github.elic0de.thejpspit.player.PitPlayer;
55
import com.github.elic0de.thejpspit.scoreboard.GameScoreboard;
66
import com.github.elic0de.thejpspit.task.GameTask;
7-
import de.themoep.minedown.MineDown;
7+
import java.math.BigDecimal;
88
import java.util.HashSet;
99
import java.util.Set;
10-
import org.bukkit.entity.Player;
1110

1211
public class Game {
1312

@@ -50,6 +49,19 @@ public void death(PitPlayer player) {
5049
return;
5150
}
5251

52+
final long streaks = player.getStreaks();
53+
54+
if (streaks > 5) {
55+
broadcast("&c【PIT】&a%killer%&7が&c%vitim%の&c%streaks%ストリーク&7を止めました!"
56+
.replaceAll("%killer%", killer.getName())
57+
.replaceAll("%vitim%", player.getName())
58+
.replaceAll("%streaks%", streaks + "")
59+
);
60+
TheJpsPit.getInstance().getEconomyHook().ifPresent(economyHook -> economyHook.giveMoney(player,
61+
BigDecimal.valueOf(streaks * 100)));
62+
killer.sendMessage(streaks * 100 + "の懸賞金がもらえます");
63+
}
64+
5365
player.increaseDeaths();
5466
player.resetStreaks();
5567
player.resetItem();
@@ -78,9 +90,7 @@ public void death(PitPlayer player) {
7890

7991
public void broadcast(String message) {
8092
for (PitPlayer pitPlayer : getPitPlayers()) {
81-
final Player player = pitPlayer.getPlayer();
82-
83-
player.spigot().sendMessage(new MineDown(message).toComponent());
93+
pitPlayer.sendMessage(message);
8494
}
8595
}
8696

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public void death(PitPlayer pitPlayer) {
3333
final Player player = Bukkit.getPlayer(uuid);
3434
if (player == null) continue;
3535
final double damaged = pitPlayers.get(pitPlayer.getUniqueId()).get(uuid);
36-
final double assistPer = round(damaged/totalDamage * 100);
37-
player.spigot().sendMessage(new MineDown("アシストキル [%per%]% %killedPlayer%".replaceAll("%per%", assistPer + "").replaceAll("%killedPlayer%", KillerName)).toComponent());
36+
final int assistPer = (int) round(damaged/totalDamage * 100);
37+
pitPlayer.sendMessage("アシストキル [%per%]% %killedPlayer%".replaceAll("%per%", assistPer + "").replaceAll("%killedPlayer%", KillerName));
3838
}
3939
pitPlayers.get(pitPlayer.getUniqueId()).clear();
4040
}

0 commit comments

Comments
 (0)