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

Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2013-12-23 04:17:06 -05:00
commit e60f52ff9c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/Snake.java
View File

@ -68,7 +68,7 @@ public class Snake
//Set Block //Set Block
MapUtil.QuickChangeBlockAt(_path.get(_index), 35, GetColor()); MapUtil.QuickChangeBlockAt(_path.get(_index), 35, GetColor());
int back = _index - 9; int back = _index - 10;
if (back < 0) if (back < 0)
back += _path.size(); back += _path.size();
@ -83,7 +83,7 @@ public class Snake
//Set Block //Set Block
MapUtil.QuickChangeBlockAt(_path.get(newIndex), 35, GetColor()); MapUtil.QuickChangeBlockAt(_path.get(newIndex), 35, GetColor());
back = newIndex - 9; back = newIndex - 10;
if (back < 0) if (back < 0)
back += _path.size(); back += _path.size();

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/SnowmanBoss.java
View File

@ -47,8 +47,8 @@ public class SnowmanBoss
_minions.add(new SnowmanMinion(_spawn.getWorld().spawn(_spawn, Snowman.class))); _minions.add(new SnowmanMinion(_spawn.getWorld().spawn(_spawn, Snowman.class)));
_heart = _spawn.getWorld().spawn(_spawn, IronGolem.class); _heart = _spawn.getWorld().spawn(_spawn, IronGolem.class);
_heart.setMaxHealth(150); _heart.setMaxHealth(250);
_heart.setHealth(150); _heart.setHealth(250);
UtilEnt.Vegetate(_heart); UtilEnt.Vegetate(_heart);
Host.CreatureAllowOverride = false; Host.CreatureAllowOverride = false;
@ -256,6 +256,11 @@ public class SnowmanBoss
if (_heart == null) if (_heart == null)
return; return;
if (event.GetDamageeEntity().equals(_heart))
{
event.SetKnockback(false);
}
if (event.GetCause() != DamageCause.PROJECTILE) if (event.GetCause() != DamageCause.PROJECTILE)
return; return;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part3.java
View File

@ -181,7 +181,7 @@ public class Part3 extends Part
if (!(event.GetDamageeEntity() instanceof Snowman)) if (!(event.GetDamageeEntity() instanceof Snowman))
return; return;
if (_boss == null || event.GetDamageeEntity().getPassenger() != null) if (_boss == null || event.GetDamageeEntity().getPassenger() == null)
{ {
event.SetCancelled("Snowman Wave Cancel"); event.SetCancelled("Snowman Wave Cancel");
} }