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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-16 16:39:43 -05:00
parent e35eec4cb1 208d90c4bc
commit 007d5a00dc
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

2
Plugins/Mineplex.Core/src/mineplex/core/creature/command/MobCommand.java
View File

@ -112,7 +112,7 @@ public class MobCommand extends MultiCommandBase<Creature>
HashSet<Entity> entSet = new HashSet<Entity>();
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

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
View File

@ -167,7 +167,7 @@ public class Rupture extends SkillActiveCharge
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;
//Aiming at sky

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
View File

@ -1247,7 +1247,7 @@ public class EventModule extends MiniPlugin
for (int i = 0 ; i < count ; i++)
{
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;
}