Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-16 16:39:43 -05:00
commit 007d5a00dc
4 changed files with 3 additions and 3 deletions

Binary file not shown.

View File

@ -112,7 +112,7 @@ public class MobCommand extends MultiCommandBase<Creature>
HashSet<Entity> entSet = new HashSet<Entity>(); HashSet<Entity> entSet = new HashSet<Entity>();
for (int i = 0 ; i < count ; i++) for (int i = 0 ; i < count ; i++)
{ {
entSet.add(Plugin.SpawnEntity(caller.getTargetBlock((Set<Material>) null, 0).getLocation().add(0.5, 1, 0.5), type)); entSet.add(Plugin.SpawnEntity(caller.getTargetBlock((Set<Material>) null, 150).getLocation().add(0.5, 1, 0.5), type));
} }
//Search Vars //Search Vars

View File

@ -167,7 +167,7 @@ public class Rupture extends SkillActiveCharge
public void MoveRupture(Player cur) public void MoveRupture(Player cur)
{ {
Block targetBlock = cur.getTargetBlock((HashSet<Byte>)null, 0); Block targetBlock = cur.getTargetBlock((HashSet<Byte>)null, 150);
if (targetBlock == null) return; if (targetBlock == null) return;
//Aiming at sky //Aiming at sky

View File

@ -1247,7 +1247,7 @@ public class EventModule extends MiniPlugin
for (int i = 0 ; i < count ; i++) for (int i = 0 ; i < count ; i++)
{ {
Manager.GetGame().CreatureAllowOverride = true; Manager.GetGame().CreatureAllowOverride = true;
entSet.add(Manager.GetCreature().SpawnEntity(caller.getTargetBlock((HashSet<Byte>)null, 0).getLocation().add(0.5, 1, 0.5), type)); entSet.add(Manager.GetCreature().SpawnEntity(caller.getTargetBlock((HashSet<Byte>)null, 150).getLocation().add(0.5, 1, 0.5), type));
Manager.GetGame().CreatureAllowOverride = false; Manager.GetGame().CreatureAllowOverride = false;
} }