mirror of
https://github.com/EssentialsX/Essentials.git
synced 2026-11-05 01:00:13 -05:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
367e9840cc | ||
|
|
ea590c2ed1 | ||
|
|
d93120257b | ||
|
|
e763b362d9 | ||
|
|
e5eb1ca0cb | ||
|
|
ea2649db5e | ||
|
|
b53fc9cadc | ||
|
|
4b35e1b729 |
No files matched your search
@@ -43,7 +43,7 @@ import org.bukkit.plugin.java.*;
|
||||
public class Essentials extends JavaPlugin implements IEssentials
|
||||
{
|
||||
public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans and Xeology";
|
||||
public static final int minBukkitBuildVersion = 860;
|
||||
public static final int minBukkitBuildVersion = 953;
|
||||
private static final Logger logger = Logger.getLogger("Minecraft");
|
||||
private Settings settings;
|
||||
private EssentialsPlayerListener playerListener;
|
||||
|
||||
@@ -241,6 +241,8 @@ public class EssentialsBlockListener extends BlockListener
|
||||
case JACK_O_LANTERN:
|
||||
case WOOD_PLATE:
|
||||
case STONE_PLATE:
|
||||
case PISTON_STICKY_BASE:
|
||||
case PISTON_BASE:
|
||||
is.setDurability((short)0);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ public abstract class UserData extends PlayerExtension implements IConf
|
||||
private ItemStack[] _getSavedInventory()
|
||||
{
|
||||
int size = config.getInt("inventory.size", 0);
|
||||
if (size < 1 || size > getInventory().getSize())
|
||||
if (size < 1 || (getInventory() != null && size > getInventory().getSize()))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -213,11 +213,11 @@ public class Commandspawnmob extends EssentialsCommand
|
||||
if ("Wolf".equalsIgnoreCase(type) && data.equalsIgnoreCase("tamed"))
|
||||
{
|
||||
EntityWolf wolf = ((CraftWolf)spawned).getHandle();
|
||||
wolf.d(true);
|
||||
wolf.a((PathEntity)null);
|
||||
wolf.setTamed(true);
|
||||
wolf.setPathEntity((PathEntity)null);
|
||||
wolf.setSitting(true);
|
||||
wolf.health = 20;
|
||||
wolf.a(user.getName());
|
||||
wolf.setOwnerName(user.getName());
|
||||
wolf.world.a(wolf, (byte)7);
|
||||
}
|
||||
if ("Wolf".equalsIgnoreCase(type) && data.equalsIgnoreCase("angry"))
|
||||
|
||||
@@ -447,6 +447,12 @@ detecttrack,28,0
|
||||
detectrail,28,0
|
||||
dtrack,28,0
|
||||
drail,28,0
|
||||
pistonstickybase,29,0
|
||||
stickypiston,29,0
|
||||
stickyp,29,0
|
||||
psticky,29,0
|
||||
spiston,29,0
|
||||
pistons,29,0
|
||||
spiderweb,30,0
|
||||
sweb,30,0
|
||||
web,30,0
|
||||
@@ -462,6 +468,11 @@ deadshrub,32,0
|
||||
shrubdead,32,0
|
||||
dshrub,32,0
|
||||
shrubd,32,0
|
||||
pistonbase,33,0
|
||||
piston,33,0
|
||||
pistonblock,33,0
|
||||
pistonextension,34,0
|
||||
pistonext,34,0
|
||||
whitecloth,35,0
|
||||
whitewool,35,0
|
||||
whitecotton,35,0
|
||||
@@ -591,6 +602,8 @@ blackcotton,35,15
|
||||
blacloth,35,15
|
||||
blawool,35,15
|
||||
blacotton,35,15
|
||||
pistonmovingpiece,36,0
|
||||
pistonmp,36,0
|
||||
yellowflower,37,0
|
||||
yflower,37,0
|
||||
flower,37,0
|
||||
@@ -1951,6 +1964,7 @@ diode,356,0
|
||||
cookie,357,0
|
||||
map,358,0
|
||||
chart,358,0
|
||||
shears,359,0
|
||||
goldmusicrecord,2256,0
|
||||
goldmusicdisk,2256,0
|
||||
goldmusiccd,2256,0
|
||||
|
||||
|
+1
-1
@@ -217,7 +217,7 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
}
|
||||
}
|
||||
|
||||
((CraftServer)parent.getServer()).getHandle().a(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
|
||||
((CraftServer)parent.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
|
||||
new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user