Remove logs and prevents NPEs.

Author: kolinkrewinkel

src/main/java/de/kumpelblase2/remoteentities/entities/RemotePlayer.java

@@ -5,6 +5,8 @@
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.metadata.FixedMetadataValue;
 import de.kumpelblase2.remoteentities.EntityManager;
 import de.kumpelblase2.remoteentities.api.*;
@@ -36,9 +38,20 @@ public String getName()
 	public void setName(String inName)
 	{
 		this.m_name = inName;
-		Location loc = this.getBukkitEntity().getLocation();
-		this.despawn(DespawnReason.NAME_CHANGE);
-		this.spawn(loc);
+        this.getBukkitEntity().setCustomName(this.m_name);
+        this.getBukkitEntity().setCustomNameVisible(true);
+        this.save();
+
+
+//		Location loc = this.getBukkitEntity().getLocation();
+//        Inventory inventory = this.getInventory();
+//        EntityEquipment entityEquipment = this.getBukkitEntity().getEquipment();
+//
+//		this.despawn(DespawnReason.NAME_CHANGE);
+//
+//		this.spawn(loc);
+//        this.getInventory().setContents(inventory.getContents());
+//        this.getBukkitEntity().getEquipment().setArmorContents(entityEquipment.getArmorContents());
 	}
 
 	@Override

src/main/java/de/kumpelblase2/remoteentities/persistence/BehaviorData.java

@@ -30,7 +30,6 @@ public BehaviorData(Map<String, Object> inData)
 		this.type = (String)inData.get("type");
 		List<Map<String, Object>> parameterData = (List<Map<String, Object>>)inData.get("parameters");
 
-        System.out.println("Parameters: " + parameterData.toString());
 		if(parameterData == null || parameterData.size() == 0)
 		{
 			this.parameters = new ParameterData[0];
@@ -102,8 +101,6 @@ public Class[] getParameterClasses()
 		{
 			try
 			{
-                Bukkit.broadcastMessage(parameterData.toString());
-
 				Class c = ClassUtils.getClass(this.getClass().getClassLoader(), parameterData.type);
 				if(ClassUtils.wrapperToPrimitive(c) != null)
 					c = ClassUtils.wrapperToPrimitive(c);

src/main/java/de/kumpelblase2/remoteentities/persistence/serializers/PreparationSerializer.java

@@ -30,7 +30,6 @@ public RemoteEntity create(EntityData inData)
 	{
 		EntityManager manager = RemoteEntities.getManagerOfPlugin(this.m_plugin.getName());
 
-        Bukkit.broadcastMessage(inData.toString());
         CreateEntityContext context = manager.prepareEntity(inData.type);
 		context.withName(inData.name).asPushable(inData.pushable).asStationary(inData.stationary).withID(inData.id);
 		context.withSpeed(inData.speed).withPathfindingRange(inData.pathfindingRange);

src/main/java/de/kumpelblase2/remoteentities/persistence/serializers/YMLSerializer.java

@@ -1,7 +1,10 @@
 package de.kumpelblase2.remoteentities.persistence.serializers;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
+
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
@@ -50,14 +53,11 @@ public boolean save(EntityData[] inData)
     @Override
     public EntityData[] loadData()
     {
-        if(this.m_configFile == null || this.m_config == null)
-        {
-            if(!this.loadConfig())
-                return new EntityData[0];
-        }
+        this.loadConfig();
 
-        if(!this.m_config.contains("entities"))
-            return new EntityData[0];
+        if(this.m_config.getList("entities") == null) {
+            this.m_config.set("entities", new ArrayList<EntityData>());
+        }
 
         List<EntityData> entitydata = (List<EntityData>)this.m_config.getList("entities");
         return entitydata.toArray(new EntityData[entitydata.size()]);

src/main/java/de/kumpelblase2/remoteentities/utilities/ReflectionUtil.java

@@ -167,7 +167,6 @@ public static boolean isJumping(EntityLiving inEntity)
 	public static List<ParameterData> getParameterDataForClass(Object inClass)
 	{
 		Class<?> clazz = inClass.getClass();
-		System.out.println(clazz.toString());
 		List<ParameterData> parameters = new ArrayList<ParameterData>();
 		Set<String> membersLooked = new HashSet<String>();
 		while(clazz != Object.class && clazz != Desire.class)