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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Cheese 2015-03-20 23:48:30 +11:00
commit 6a68dc6b24
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
View File

@ -83,6 +83,7 @@ import mineplex.core.packethandler.PacketPlayOutWorldBorder;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.visibility.VisibilityManager;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
@ -185,7 +186,7 @@ public class SurvivalGames extends SoloGame
new KitNecromancer(manager), new KitNecromancer(manager),
new KitBarbarian(manager), new KitBarbarian(manager),
new KitHorseman(manager), new KitHorseman(manager),
}, },
@ -744,14 +745,9 @@ public class SurvivalGames extends SoloGame
{ {
if (_deathMatchTime == 5) if (_deathMatchTime == 5)
{ {
for (Player player : GetPlayers(true)) for (Player player : GetPlayers(true))
{ {
for (Player other : GetPlayers(true)) VisibilityManager.Instance.refreshPlayerToAll(player);
{
player.hidePlayer(other);
player.showPlayer(other);
}
} }
} }
else if (_deathMatchTime == 0) else if (_deathMatchTime == 0)
@ -1734,7 +1730,7 @@ public class SurvivalGames extends SoloGame
// Food // Food
_baseLoot.registerLoot(new RandomItem(Material.BAKED_POTATO, 30, 1, 3)); _baseLoot.registerLoot(new RandomItem(Material.BAKED_POTATO, 30, 1, 3));
_baseLoot.registerLoot(new RandomItem(Material.COOKED_BEEF, 30, 1, 2)); _baseLoot.registerLoot(new RandomItem(Material.COOKED_BEEF, 30, 1, 2));
_baseLoot.registerLoot(new RandomItem(Material.COOKED_CHICKEN, 30, 1, 2)); _baseLoot.registerLoot(new RandomItem(Material.COOKED_CHICKEN, 30, 1, 2));
_baseLoot.registerLoot(new RandomItem(Material.RAW_FISH, 30, 1, 5)); _baseLoot.registerLoot(new RandomItem(Material.RAW_FISH, 30, 1, 5));
_baseLoot.registerLoot(new RandomItem(Material.RAW_BEEF, 30, 1, 5)); _baseLoot.registerLoot(new RandomItem(Material.RAW_BEEF, 30, 1, 5));
_baseLoot.registerLoot(new RandomItem(Material.RAW_CHICKEN, 30, 1, 5)); _baseLoot.registerLoot(new RandomItem(Material.RAW_CHICKEN, 30, 1, 5));
@ -2054,7 +2050,7 @@ public class SurvivalGames extends SoloGame
TNTPrimed tnt = player.getWorld() TNTPrimed tnt = player.getWorld()
.spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class); .spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
tnt.setFuseTicks(40); tnt.setFuseTicks(40);
UtilAction.velocity(tnt, player.getLocation().getDirection(), 0.5, false, 0, 0.1, 10, false); UtilAction.velocity(tnt, player.getLocation().getDirection(), 0.5, false, 0, 0.1, 10, false);