Fix CME

src/de/steamwar/spectatesystem/elements/REntity.java

@@ -41,7 +41,9 @@ public abstract class REntity {
     protected REntity(int internalId, Entity entity){
         this.internalId = internalId;
         this.entity = entity;
+        synchronized(entities){
             entities.put(internalId, this);
+        }
 
         for(Player player : Bukkit.getOnlinePlayers()){
             sendToPlayer(player);
@@ -49,17 +51,15 @@ public abstract class REntity {
     }
 
     public static void playerJoins(Player player){
+        synchronized(entities){
             for(REntity entity : entities.values()){
                 entity.sendToPlayer(player);
                 entity.sendLocation(player);
             }
         }
+    }
 
     protected static EntityLiving getShooter(){
-        for(REntity entity : entities.values()){
-            if(entity.entity instanceof EntityLiving)
-                return (EntityLiving) entity.entity;
-        }
         return ((CraftPlayer)Bukkit.getOnlinePlayers().iterator().next()).getHandle();
     }
 
@@ -69,11 +69,13 @@ public abstract class REntity {
 
     public static void removeAll(){
         int entity_counter = 0;
+        synchronized (entities){
             while(!entities.isEmpty()){
                 entity_counter++;
                 REntity entity = entities.values().iterator().next();
                 entity.remove();
             }
+        }
         System.out.println("Has to remove manually " + entity_counter + " entities!");
     }
 
@@ -96,8 +98,10 @@ public abstract class REntity {
             connection.sendPacket(packet);
         }
         Bukkit.getScheduler().runTask(SpectateSystem.get(), entity::die);
+        synchronized (entities){
             entities.remove(internalId);
         }
+    }
 
     public void sneak(boolean sneaking) {
         entity.setSneaking(sneaking);