JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Chiss 2014-09-17 08:59:09 +10:00
parent 6eed36f0ee
commit e6797582f9
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Plugins/Mineplex.Core/src/mineplex/core/join/JoinQuit.java
View File

@ -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()));
}
}

2
Plugins/Mineplex.Core/src/mineplex/core/treasure/reward/rewards/UnknownPackageReward.java
View File

@ -35,7 +35,7 @@ public class UnknownPackageReward extends AbstractReward
@Override @Override
public boolean canGiveReward(Player player) public boolean canGiveReward(Player player)
{ {
return _donationManager.Get(player.getName()).OwnsUnknownPackage(_packageName); return !_donationManager.Get(player.getName()).OwnsUnknownPackage(_packageName);
} }
protected String getPackageName() protected String getPackageName()

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java
View File

@ -539,7 +539,7 @@ public class CastleSiege extends TeamGame
if (this.WorldTimeSet > 24100) if (this.WorldTimeSet > 24100)
{ {
SetCustomWinLine(_kingName + ChatColor.RESET + " has survived the seige!"); SetCustomWinLine(_kingName + ChatColor.RESET + " has survived the siege!");
AnnounceEnd(GetTeam(ChatColor.AQUA)); AnnounceEnd(GetTeam(ChatColor.AQUA));

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java
View File

@ -23,8 +23,15 @@ public class DamageTakenStatTracker extends StatTracker<Game>
return; return;
addStat(damagee, "Damage Taken", (int) Math.round(event.GetDamage()), false, false); 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) if (getGame().GetKit(damagee) != null)
{
addStat(damagee, getGame().GetKit(damagee).GetName() + " Damage Taken", (int) Math.round(event.GetDamage()), false, false); 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);
}
} }
} }