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

bacon brawl fix

Browse Source 
signel game ultra shows in hub scoreboard
This commit is contained in:
Chiss 2014-08-10 00:09:39 +10:00
parent 21b89d2771
commit a43a5b2c0e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -60,6 +60,7 @@ import mineplex.core.disguise.DisguiseManager;
import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.disguise.disguises.DisguiseSlime;
import mineplex.core.donation.DonationManager;
import mineplex.core.donation.Donor;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.event.GadgetCollideEntityEvent;
import mineplex.core.inventory.InventoryManager;
@ -759,8 +760,15 @@ public class HubManager extends MiniClientPlugin<HubClient>
obj.getScore(C.cGold + C.Bold + "Rank").setScore(line--);
if (GetClients().Get(player).GetRank().Has(Rank.ULTRA))
obj.getScore(GetClients().Get(player).GetRank().Name).setScore(line--);
else if (GetDonation().Get(player.getName()).OwnsUnknownPackage("SuperSmashMobs ULTRA") ||
GetDonation().Get(player.getName()).OwnsUnknownPackage("Survival Games ULTRA") ||
GetDonation().Get(player.getName()).OwnsUnknownPackage("Minigames ULTRA") ||
GetDonation().Get(player.getName()).OwnsUnknownPackage("CastleSiege ULTRA") ||
GetDonation().Get(player.getName()).OwnsUnknownPackage("Champions ULTRA"))
obj.getScore("Single Ultra").setScore(line--);
else
obj.getScore("No Rank").setScore(line--);
//Space
obj.getScore(" ").setScore(line--);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java
View File

@ -74,7 +74,7 @@ public class BaconBrawl extends SoloGame
if (event.GetCause() == DamageCause.ENTITY_ATTACK || event.GetCause() == DamageCause.CUSTOM || event.GetCause() == DamageCause.PROJECTILE)
{
event.GetDamageeEntity().setHealth(event.GetDamageeEntity().getMaxHealth());
event.AddKnockback("Pig Wrestle", 1.5 + (GetStateTime() / 60000d));
event.AddKnockback("Pig Wrestle", 1.5 + (System.currentTimeMillis() - GetStateTime() / 60000d));
}
}
}