Fix save inventory after logout for new players.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1583 e251c2fe-e539-e718-e476-b85c1f46cddb

Essentials/src/com/earth2me/essentials/Essentials.java

@@ -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;

Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java

@@ -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;
 		}

Essentials/src/com/earth2me/essentials/Mob.java

@@ -1,75 +1,55 @@
 package com.earth2me.essentials;
 
-import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.minecraft.server.Entity;
-import net.minecraft.server.WorldServer;
+import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
 
 public enum Mob
 {
-	CHICKEN("Chicken", Enemies.FRIENDLY),
-	COW("Cow", Enemies.FRIENDLY),
-	CREEPER("Creeper", Enemies.ENEMY),
-	GHAST("Ghast", Enemies.ENEMY),
-	GIANT("Giant", "GiantZombie", Enemies.ENEMY),
-	PIG("Pig", Enemies.FRIENDLY),
-	PIGZOMB("PigZombie", Enemies.NEUTRAL),
-	SHEEP("Sheep", Enemies.FRIENDLY, ""),
-	SKELETON("Skeleton", Enemies.ENEMY),
-	SLIME("Slime", Enemies.ENEMY),
-	SPIDER("Spider", Enemies.ENEMY),
-	SQUID("Squid", Enemies.FRIENDLY),
-	ZOMBIE("Zombie", Enemies.ENEMY),
-	MONSTER("Monster", Enemies.ENEMY),
-	WOLF("Wolf", Enemies.NEUTRAL);
+	CHICKEN("Chicken", Enemies.FRIENDLY, CreatureType.CHICKEN),
+	COW("Cow", Enemies.FRIENDLY, CreatureType.COW),
+	CREEPER("Creeper", Enemies.ENEMY, CreatureType.CREEPER),
+	GHAST("Ghast", Enemies.ENEMY, CreatureType.GHAST),
+	GIANT("Giant", Enemies.ENEMY, CreatureType.GIANT),
+	PIG("Pig", Enemies.FRIENDLY, CreatureType.PIG),
+	PIGZOMB("PigZombie", Enemies.NEUTRAL, CreatureType.PIG_ZOMBIE),
+	SHEEP("Sheep", Enemies.FRIENDLY, "", CreatureType.SHEEP),
+	SKELETON("Skeleton", Enemies.ENEMY, CreatureType.SKELETON),
+	SLIME("Slime", Enemies.ENEMY, CreatureType.SLIME),
+	SPIDER("Spider", Enemies.ENEMY, CreatureType.SPIDER),
+	SQUID("Squid", Enemies.FRIENDLY, CreatureType.SQUID),
+	ZOMBIE("Zombie", Enemies.ENEMY, CreatureType.ZOMBIE),
+	MONSTER("Monster", Enemies.ENEMY, CreatureType.MONSTER),
+	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF);
 
 	public static final Logger logger = Logger.getLogger("Minecraft");
 
-	private Mob(String n, Enemies en, String s)
+	private Mob(String n, Enemies en, String s, CreatureType type)
 	{
-		this.s = s;
+		this.suffix = s;
 		this.name = n;
-		this.craftClass = n;
-		this.entityClass = n;
 		this.type = en;
+		this.bukkitType = type;
 	}
 
-	private Mob(String n, Enemies en)
+	private Mob(String n, Enemies en, CreatureType type)
 	{
 		this.name = n;
-		this.craftClass = n;
-		this.entityClass = n;
 		this.type = en;
+		this.bukkitType = type;
 	}
 
-	private Mob(String n, String ec, Enemies en)
-	{
-		this.name = n;
-		this.craftClass = n;
-		this.entityClass = ec;
-		this.type = en;
-	}
-
-	private Mob(String n, String ec, String cc, Enemies en)
-	{
-		this.name = n;
-		this.entityClass = ec;
-		this.craftClass = cc;
-		this.type = en;
-	}
-	public String s = "s";
-	public String name;
-	public Enemies type;
-	private String entityClass;
-	private String craftClass;
+	public String suffix = "s";
+	final public String name;
+	final public Enemies type;
+	final private CreatureType bukkitType;
 	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();
 
 	static
@@ -80,24 +60,16 @@ public enum Mob
 		}
 	}
 
-	@SuppressWarnings(
+	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
 	{
-		"unchecked", "CallToThreadDumpStack"
-	})
-	public CraftEntity spawn(Player player, Server server) throws MobException
-	{
-		try
+
+		final LivingEntity entity = player.getWorld().spawnCreature(loc, this.bukkitType);
+		if (entity == null)
 		{
-			WorldServer world = ((org.bukkit.craftbukkit.CraftWorld)player.getWorld()).getHandle();
-			Constructor<CraftEntity> craft = (Constructor<CraftEntity>)ClassLoader.getSystemClassLoader().loadClass("org.bukkit.craftbukkit.entity.Craft" + craftClass).getConstructors()[0];
-			Constructor<Entity> entity = (Constructor<Entity>)ClassLoader.getSystemClassLoader().loadClass("net.minecraft.server.Entity" + entityClass).getConstructors()[0];
-			return craft.newInstance((CraftServer)server, entity.newInstance(world));
-		}
-		catch (Exception ex)
-		{
-			logger.log(Level.WARNING, Util.i18n("unableToSpawnMob"), ex);
-			throw new MobException(ex);
+			logger.log(Level.WARNING, Util.i18n("unableToSpawnMob"));
+			throw new MobException();
 		}
+		return entity;
 	}
 
 
@@ -107,22 +79,17 @@ public enum Mob
 		NEUTRAL("neutral"),
 		ENEMY("enemy");
 
-		private Enemies(String t)
+		private Enemies(final String t)
 		{
 			this.type = t;
 		}
-		protected String type;
+		final protected String type;
 	}
 
 
 	public static class MobException extends Exception
 	{
 		private static final long serialVersionUID = 1L;
-
-		private MobException(Exception ex)
-		{
-			super(ex);
-		}
 	}
 
 	public static Mob fromName(String n)

Essentials/src/com/earth2me/essentials/UserData.java

@@ -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;
 		}

Essentials/src/com/earth2me/essentials/commands/Commandspawner.java

@@ -6,6 +6,7 @@ import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
+import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
 import org.bukkit.entity.CreatureType;
 
 
@@ -19,12 +20,12 @@ public class Commandspawner extends EssentialsCommand
 	@Override
 	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		if (args.length < 1)
+		if (args.length < 1 || args[0].length() < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		Block target = user.getTarget().getTargetBlock();
+		final Block target = user.getTarget().getTargetBlock();
 		if (target.getType() != Material.MOB_SPAWNER)
 		{
 			throw new Exception(Util.i18n("mobSpawnTarget"));
@@ -33,7 +34,8 @@ public class Commandspawner extends EssentialsCommand
 		charge(user);
 		try
 		{
-			((CreatureSpawner)target).setCreatureType(CreatureType.fromName(args[0]));
+			final String name = args[0].substring(0, 1).toUpperCase() +  args[0].substring(1).toLowerCase();
+			new CraftCreatureSpawner(target).setCreatureType(CreatureType.fromName(name));
 		}
 		catch (Throwable ex)
 		{

Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java

@@ -3,8 +3,6 @@ package com.earth2me.essentials.commands;
 import net.minecraft.server.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Mob.MobException;
@@ -20,6 +18,7 @@ import org.bukkit.craftbukkit.entity.CraftCreeper;
 import org.bukkit.craftbukkit.entity.CraftSheep;
 import org.bukkit.craftbukkit.entity.CraftSlime;
 import org.bukkit.craftbukkit.entity.CraftWolf;
+import org.bukkit.entity.Entity;
 
 
 public class Commandspawnmob extends EssentialsCommand
@@ -62,9 +61,9 @@ public class Commandspawnmob extends EssentialsCommand
 		}
 
 
-		CraftEntity spawnedMob = null;
+		Entity spawnedMob = null;
 		Mob mob = null;
-		CraftEntity spawnedMount = null;
+		Entity spawnedMount = null;
 		Mob mobMount = null;
 
 		mob = Mob.fromName(mobType);
@@ -74,16 +73,6 @@ public class Commandspawnmob extends EssentialsCommand
 			return;
 		}
 		charge(user);
-		WorldServer world = ((CraftWorld)user.getWorld()).getHandle();
-		try
-		{
-			spawnedMob = mob.spawn(user, server);
-		}
-		catch (MobException e)
-		{
-			user.sendMessage(Util.i18n("unableToSpawnMob"));
-			return;
-		}
 		int[] ignore =
 		{
 			8, 9
@@ -96,8 +85,16 @@ public class Commandspawnmob extends EssentialsCommand
 			loc.setY(loc.getY() + 1);
 			block = user.getWorld().getBlockAt(loc);
 		}
-		spawnedMob.teleportTo(loc);
-		world.addEntity(spawnedMob.getHandle());
+		
+		try
+		{
+			spawnedMob = mob.spawn(user, server, loc);
+		}
+		catch (MobException e)
+		{
+			user.sendMessage(Util.i18n("unableToSpawnMob"));
+			return;
+		}
 
 		if (mountType != null)
 		{
@@ -109,16 +106,14 @@ public class Commandspawnmob extends EssentialsCommand
 			}
 			try
 			{
-				spawnedMount = mobMount.spawn(user, server);
+				spawnedMount = mobMount.spawn(user, server, loc);
 			}
 			catch (MobException e)
 			{
 				user.sendMessage(Util.i18n("unableToSpawnMob"));
 				return;
 			}
-			spawnedMount.teleportTo(spawnedMob);
-			spawnedMount.getHandle().setPassengerOf(spawnedMob.getHandle());
-			world.addEntity(spawnedMount.getHandle());
+			spawnedMob.setPassenger(spawnedMount);
 		}
 		if (mobData != null)
 		{
@@ -142,23 +137,19 @@ public class Commandspawnmob extends EssentialsCommand
 			{
 				for (int i = 1; i < mobCount; i++)
 				{
-					spawnedMob = mob.spawn(user, server);
-					spawnedMob.teleportTo(loc);
-					world.addEntity(spawnedMob.getHandle());
+					spawnedMob = mob.spawn(user, server, loc);
 					if (mobMount != null)
 					{
 						try
 						{
-							spawnedMount = mobMount.spawn(user, server);
+							spawnedMount = mobMount.spawn(user, server, loc);
 						}
 						catch (MobException e)
 						{
 							user.sendMessage(Util.i18n("unableToSpawnMob"));
 							return;
 						}
-						spawnedMount.teleportTo(spawnedMob);
-						spawnedMount.getHandle().setPassengerOf(spawnedMob.getHandle());
-						world.addEntity(spawnedMount.getHandle());
+						spawnedMob.setPassenger(spawnedMount);
 					}
 					if (mobData != null)
 					{
@@ -169,7 +160,7 @@ public class Commandspawnmob extends EssentialsCommand
 						changeMobData(mobMount.name, spawnedMount, mountData, user);
 					}
 				}
-				user.sendMessage(args[1] + " " + mob.name.toLowerCase() + mob.s + Util.i18n("spawned"));
+				user.sendMessage(args[1] + " " + mob.name.toLowerCase() + mob.suffix + Util.i18n("spawned"));
 			}
 			catch (MobException e1)
 			{
@@ -195,7 +186,7 @@ public class Commandspawnmob extends EssentialsCommand
 		return s.toUpperCase().charAt(0) + s.toLowerCase().substring(1);
 	}
 
-	private void changeMobData(String type, CraftEntity spawned, String data, User user) throws Exception
+	private void changeMobData(String type, Entity spawned, String data, User user) throws Exception
 	{
 		if ("Slime".equalsIgnoreCase(type))
 		{
@@ -222,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"))

Essentials/src/items.csv

@@ -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

EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java

@@ -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;