diff --git a/src/main/java/dev/hrz0/smp4/Listeners/DeathListener.java b/src/main/java/dev/hrz0/smp4/Listeners/DeathListener.java index 7a61ff8..90fff61 100644 --- a/src/main/java/dev/hrz0/smp4/Listeners/DeathListener.java +++ b/src/main/java/dev/hrz0/smp4/Listeners/DeathListener.java @@ -67,10 +67,14 @@ public class DeathListener implements Listener { states.kdr.increasePlayerKills(killer); killer.sendRichMessage("[SMP4] Your kdr has been updated."); + logger.info(String.format(""" + %s received %s points from bounty and %s lost %s points""", killer.getName(), killedWorth, killed.getName(), money - newMoney)); + Utilities.setScore(killed, 0); } } else { killer.sendRichMessage("[SMP4] You've killed this player too recently."); + logger.info(String.format("%s got killed by %s but %s's last kill is the same player.", killed.getName(), killer.getName(), killer.getName())); } states.killsHistory.updateLastKill(killer.getUniqueId().toString(), killed.getUniqueId().toString()); @@ -78,63 +82,4 @@ public class DeathListener implements Listener { this.logger.info(states.killsHistory.toString()); } } - - -// @EventHandler(priority = EventPriority.HIGHEST) -// public void onPlayerDeath(PlayerDeathEvent event) { -// Player killed = event.getEntity().getPlayer(); -// Player killer = event.getEntity().getKiller(); -// -// if (killed != null && killer != null && killer.getType().equals(EntityType.PLAYER)) { -// logger.log(Level.INFO, String.format("%s killed %s", killer, killed)); -// -// int killedRanking = states.rankings.getPlayerRanking(killed); -// int killerRanking = states.rankings.getPlayerRanking(killer); -// -// int[] newRankings = ELO.EloRating(killedRanking, killerRanking, 200, 0); -// -// states.rankings.setPlayerRanking(killed, newRankings[0]); -// states.rankings.setPlayerRanking(killer, newRankings[1]); -// -// MiniMessage mm = MiniMessage.miniMessage(); -// -// Component msg = mm.deserialize(String.format(""" -// [ELO] Updated rankings: -// %s's ranking increased by %s (%s->%s) -// %s's ranking decreased by %s (%s->%s)""", -// killer.getName(), newRankings[1] - killerRanking, killerRanking, newRankings[1], killed.getName(), killedRanking - newRankings[0], killedRanking, newRankings[0])); -// -// Utilities.setScore(killed, newRankings[0]); -// Utilities.setScore(killer, newRankings[1]); -// -// Utilities.announce(msg); -// -// List commands = config.getStringList("killCommands"); -// Map toFill = new HashMap(); -// toFill.put("", killer.getName()); -// toFill.put("", killed.getName()); -// Utilities.runCommands(commands, toFill); -// -// if (Bukkit.getPluginManager().isPluginEnabled("PlayerPoints")) { -// this.pointsAPI = PlayerPoints.getInstance().getAPI(); -// -// if (this.pointsAPI != null) { -// // Take money -// double money = pointsAPI.look(killed.getUniqueId()); -// double newMoney = money * ((double) (100 - config.getInt("percentOfMoneyToTakeOnKills")) / 100); -// pointsAPI.set(killed.getUniqueId(), (int) newMoney); -// -// killed.sendRichMessage(String.format("[SMP4] You lost %s points by getting killed by %s (%s->%s).", money - newMoney, killed.getName(), money, newMoney)); -// -// // Give money -// int moneyGain = newRankings[1] - killerRanking; -// int multiplier = config.getInt("moneyMultiplier"); -// pointsAPI.give(killer.getUniqueId(), moneyGain*multiplier); -// -// killer.sendRichMessage(String.format("[SMP4] You received %s points for killing %s.", moneyGain*multiplier, killed.getName())); -// } -// } -// -// } -// } }