more changes! it's getting pretty cool now x)

This commit is contained in:
fooify 2015-08-07 14:20:15 -07:00
parent f70b1231ab
commit db521668a9
1 changed files with 18 additions and 19 deletions

View File

@ -31,6 +31,7 @@ import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilFirework;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilTextTop;
import mineplex.core.common.util.UtilTime;
import mineplex.core.hologram.Hologram;
import mineplex.core.hologram.Hologram.HologramTarget;
@ -96,6 +97,7 @@ public class Maze implements Listener
if (Host.IsLive())
{
//checkGoal();
UtilTextTop.display(C.cAqua + C.Bold + "Get to the safe pad or you'll take damage!", Host.GetPlayers(false).toArray(new Player[Host.GetPlayers(false).size()]));
move();
bump();
}
@ -308,11 +310,11 @@ Caused by: java.lang.NullPointerException
_safePad = new SafePad(Host, this, UtilAlg.Random(_goals).clone().subtract(0,1,0));
_safePad.build();
UtilFirework.playFirework(_safePad.getLocation(), FireworkEffect.builder().withColor(Color.LIME).build());
Location holoLoc = _safePad.getLocation().clone();
holoLoc.add(0, 2, 0);
_holo = new Hologram(Host.getArcadeManager().getHologramManager(), holoLoc, C.cAqua + C.Bold + "SAFE PAD!");
_holo.setHologramTarget(HologramTarget.BLACKLIST);
_holo.start();
// Location holoLoc = _safePad.getLocation().clone();
// holoLoc.add(0, 2, 0);
// _holo = new Hologram(Host.getArcadeManager().getHologramManager(), holoLoc, C.cAqua + C.Bold + "SAFE PAD!");
// _holo.setHologramTarget(HologramTarget.BLACKLIST);
// _holo.start();
_phaseTimer = 11;
return;
}
@ -326,7 +328,6 @@ Caused by: java.lang.NullPointerException
_oldSafePad.setGlassData((byte)4);
_oldSafePad.turnOffBeacon();
}
Host.Announce(C.cAqua + C.Bold + "Quick! Go step on the safe pad or you'll take damage!");
}
if(_phaseTimer == 9)
{
@ -347,8 +348,6 @@ Caused by: java.lang.NullPointerException
{
if(_safePad.isOn(p))
{
//UtilPlayer.message(p, C.cGreen + C.Bold + "You got onto the safe pad, so you didn't take damage.");
UtilPlayer.message(p, F.main("Game", "You got on the safe pad, so no additional damage was dealt to your body."));
}
else
{
@ -356,15 +355,15 @@ Caused by: java.lang.NullPointerException
DamageCause.CUSTOM, 10, false, false, false,
"Game", "Map damage");
//UtilPlayer.message(p, C.cRed + C.Bold + "Oh no! You didn't get to the safe pad in time.");
UtilPlayer.message(p, F.main("Game", "You took damage because you weren't on the safe pad."));
UtilPlayer.message(p, F.main("Game", C.cRed + "You took damage because you weren't on the safe pad!"));
}
}
//_goalPlayers.clear();
if(_holo != null)
{
_holo.stop();
_holo = null;
}
// if(_holo != null)
// {
// _holo.stop();
// _holo = null;
// }
_oldSafePad = _safePad;
_oldSafePad.turnOffBeacon();
@ -374,11 +373,11 @@ Caused by: java.lang.NullPointerException
_safePad = new SafePad(Host, this, UtilAlg.Random(_goals).clone().subtract(0,1,0));
_safePad.build();
UtilFirework.playFirework(_safePad.getLocation(), FireworkEffect.builder().withColor(Color.LIME).build());
Location holoLoc = _safePad.getLocation().clone();
holoLoc.add(0, 2, 0);
_holo = new Hologram(Host.getArcadeManager().getHologramManager(), holoLoc, C.cAqua + C.Bold + "SAFE PAD!");
_holo.setHologramTarget(HologramTarget.BLACKLIST);
_holo.start();
// Location holoLoc = _safePad.getLocation().clone();
// holoLoc.add(0, 2, 0);
// _holo = new Hologram(Host.getArcadeManager().getHologramManager(), holoLoc, C.cAqua + C.Bold + "SAFE PAD!");
// _holo.setHologramTarget(HologramTarget.BLACKLIST);
// _holo.start();
// for(Block b : _waypoints)
// {
// if(b.getRelative(BlockFace.DOWN).getType().equals(Material.QUARTZ_BLOCK))