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 

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
This commit is contained in:
Chiss 2013-12-13 18:05:08 +11:00
parent 5f2e457362 d6544202f0
commit 1eebed737e
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
View File

@ -20,15 +20,12 @@ import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Creature; import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity;import org.bukkit.entity.Creature;import org.bukkit.entity.Entity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Giant; import org.bukkit.entity.Giant;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton; import org.bukkit.entity.Skeleton;import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCreature;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCreature;
import org.bukkit.craftbukkit.v1_6_R3.CraftWorld; import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
public class UtilEnt public class UtilEnt
@ -46,6 +43,14 @@ public class UtilEnt
return _nameMap; return _nameMap;
} }
public static void ghost(Entity entity, boolean ghost)
{
if (entity instanceof LivingEntity)
{
((CraftLivingEntity)entity).getHandle().ghost = ghost;
}
}
public static void Vegetate(Entity entity) public static void Vegetate(Entity entity)
{ {
try try

2
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
View File

@ -37,7 +37,7 @@ public class Halloween2013_BatGun extends ItemGadget
private HashMap<Player, Location> _velocity = new HashMap<Player, Location>(); private HashMap<Player, Location> _velocity = new HashMap<Player, Location>();
private HashMap<Player, ArrayList<Bat>> _bats = new HashMap<Player, ArrayList<Bat>>(); private HashMap<Player, ArrayList<Bat>> _bats = new HashMap<Player, ArrayList<Bat>>();
public Halloween2013_BatGun(GadgetManager manager) public Halloween2013_BatGun(GadgetManager manager)
{ {
super(manager, "Bat Blaster", new String[] super(manager, "Bat Blaster", new String[]
{ {

1
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/Entity.java
View File

@ -42,6 +42,7 @@ import net.minecraft.server.v1_6_R3.Vec3D;
import net.minecraft.server.v1_6_R3.World; import net.minecraft.server.v1_6_R3.World;
import net.minecraft.server.v1_6_R3.WorldServer; import net.minecraft.server.v1_6_R3.WorldServer;
// CraftBukkit start // CraftBukkit start
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java
View File

@ -39,7 +39,7 @@ public class GameFactory
{ {
private ArcadeManager _manager; private ArcadeManager _manager;
public GameFactory(ArcadeManager gameManager) public GameFactory(ArcadeManager gameManager)
{ {
_manager = gameManager; _manager = gameManager;
} }

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
View File

@ -126,6 +126,7 @@ public abstract class Kit implements Listener
} }
UtilEnt.Vegetate(entity); UtilEnt.Vegetate(entity);
UtilEnt.ghost(entity, true);
SpawnCustom(entity); SpawnCustom(entity);