From e6797582f9ebe6dd5381f35cdc5df4f0b005e072 Mon Sep 17 00:00:00 2001 From: Chiss Date: Wed, 17 Sep 2014 08:59:09 +1000 Subject: [PATCH] Minor fixes --- .../src/mineplex/core/join/JoinQuit.java | 22 ------------------- .../reward/rewards/UnknownPackageReward.java | 2 +- .../game/games/castlesiege/CastleSiege.java | 2 +- .../arcade/stats/DamageTakenStatTracker.java | 9 +++++++- 4 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 Plugins/Mineplex.Core/src/mineplex/core/join/JoinQuit.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/join/JoinQuit.java b/Plugins/Mineplex.Core/src/mineplex/core/join/JoinQuit.java deleted file mode 100644 index eb6ba04f7..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/join/JoinQuit.java +++ /dev/null @@ -1,22 +0,0 @@ -package mineplex.core.join; - -import org.bukkit.event.EventHandler; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerQuitEvent; - -import mineplex.core.common.util.F; - -public class JoinQuit -{ - @EventHandler - public void Join(PlayerJoinEvent event) - { - event.setJoinMessage(F.sys("Join", event.getPlayer().getName())); - } - - @EventHandler - public void Quit(PlayerQuitEvent event) - { - event.setQuitMessage(F.sys("Quit", event.getPlayer().getName())); - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/reward/rewards/UnknownPackageReward.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/reward/rewards/UnknownPackageReward.java index 0968e71d0..a0195fa42 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/reward/rewards/UnknownPackageReward.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/reward/rewards/UnknownPackageReward.java @@ -35,7 +35,7 @@ public class UnknownPackageReward extends AbstractReward @Override public boolean canGiveReward(Player player) { - return _donationManager.Get(player.getName()).OwnsUnknownPackage(_packageName); + return !_donationManager.Get(player.getName()).OwnsUnknownPackage(_packageName); } protected String getPackageName() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java index 666ec9202..1c1207d49 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java @@ -539,7 +539,7 @@ public class CastleSiege extends TeamGame if (this.WorldTimeSet > 24100) { - SetCustomWinLine(_kingName + ChatColor.RESET + " has survived the seige!"); + SetCustomWinLine(_kingName + ChatColor.RESET + " has survived the siege!"); AnnounceEnd(GetTeam(ChatColor.AQUA)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java index 1f584cbb5..fa957c108 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java @@ -21,10 +21,17 @@ public class DamageTakenStatTracker extends StatTracker Player damagee = event.GetDamageePlayer(); if (damagee == null) return; - + addStat(damagee, "Damage Taken", (int) Math.round(event.GetDamage()), false, false); + if (event.GetDamagerPlayer(true) != null) + addStat(damagee, "Damage Taken PvP ", (int) Math.round(event.GetDamage()), false, false); if (getGame().GetKit(damagee) != null) + { addStat(damagee, getGame().GetKit(damagee).GetName() + " Damage Taken", (int) Math.round(event.GetDamage()), false, false); + + if (event.GetDamagerPlayer(true) != null) + addStat(damagee, getGame().GetKit(damagee).GetName() + " Damage Taken PvP ", (int) Math.round(event.GetDamage()), false, false); + } } }