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

Remove unnecessary tabs. Make the judge guardian use it's own laser again.

Browse Source
This commit is contained in:
Virizion 2016-01-24 21:55:57 -05:00
parent 0eda813d41
commit bfe9aa7a59
7 changed files with 118 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java
View File

@ -122,7 +122,6 @@ public class SpeedBuilders extends SoloGame
private ArmorStand _judgeEntity; private ArmorStand _judgeEntity;
private DisguiseGuardian _judgeDisguise; private DisguiseGuardian _judgeDisguise;
private Location _judgeSpawn; private Location _judgeSpawn;
private ArmorStand _judgeLaserHelper;
private ArmorStand _judgeLaserTarget; private ArmorStand _judgeLaserTarget;
private ArrayList<RecreationData> _toEliminate = new ArrayList<RecreationData>(); private ArrayList<RecreationData> _toEliminate = new ArrayList<RecreationData>();
@ -362,42 +361,30 @@ public class SpeedBuilders extends SoloGame
if (_judgeLaserTarget == null) if (_judgeLaserTarget == null)
return; return;
Manager.GetDisguise().undisguise(_judgeLaserHelper);
_judgeLaserHelper.remove();
_judgeLaserTarget.remove(); _judgeLaserTarget.remove();
_judgeLaserHelper = null;
_judgeLaserTarget = null; _judgeLaserTarget = null;
_judgeDisguise.setTarget(0);
Manager.GetDisguise().updateDisguise(_judgeDisguise);
} }
else else
{ {
if (_judgeLaserTarget != null) if (_judgeLaserTarget != null)
judgeTargetLocation(null); judgeTargetLocation(null);
CreatureAllowOverride = true;
_judgeLaserHelper = _judgeEntity.getWorld().spawn(_judgeEntity.getLocation().subtract(_judgeEntity.getLocation().getDirection().multiply(2)), ArmorStand.class);
_judgeLaserTarget = _judgeEntity.getWorld().spawn(loc, ArmorStand.class); _judgeLaserTarget = _judgeEntity.getWorld().spawn(loc, ArmorStand.class);
CreatureAllowOverride = false;
_judgeLaserHelper.setVisible(false);
_judgeLaserHelper.setGravity(false);
_judgeLaserHelper.setSmall(true);
_judgeLaserTarget.setVisible(false); _judgeLaserTarget.setVisible(false);
_judgeLaserTarget.setGravity(false); _judgeLaserTarget.setGravity(false);
_judgeLaserTarget.setSmall(true); _judgeLaserTarget.setSmall(true);
UtilEnt.CreatureLook(_judgeEntity, _judgeLaserTarget.getLocation()); UtilEnt.CreatureLook(_judgeEntity, _judgeLaserTarget.getLocation());
DisguiseGuardian disguise = new DisguiseGuardian(_judgeLaserHelper); _judgeDisguise.setTarget(_judgeLaserTarget.getEntityId());
disguise.setTarget(_judgeLaserTarget.getEntityId()); Manager.GetDisguise().updateDisguise(_judgeDisguise);
disguise.setInvisible(true);
Manager.GetDisguise().disguise(disguise);
} }
} }