Fixed some bugs. Added more log output.

kniffo80 · kniffo80 · commit e591e5e65efc · 2016-12-20T09:24:59.000+01:00
diff --git a/src/main/java/de/kniffo80/mobplugin/AutoSpawnTask.java b/src/main/java/de/kniffo80/mobplugin/AutoSpawnTask.java
@@ -166,8 +166,9 @@ private void prepareMaxSpawns() {
                 maxSpawns.get(Zombie.NETWORK_ID), maxSpawns.get(ZombieHorse.NETWORK_ID), maxSpawns.get(ZombieVillager.NETWORK_ID)));
     }
 
-    public boolean entitySpawnAllowed(Level level, int networkId) {
+    public boolean entitySpawnAllowed(Level level, int networkId, String entityName) {
         int count = countEntity(level, networkId);
+        FileLogger.debug(String.format("Found %s/%s living %s", count, maxSpawns.get(networkId), entityName));
         if (count < maxSpawns.get(networkId)) {
             return true;
         }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/autospawn/AbstractEntitySpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/autospawn/AbstractEntitySpawner.java
@@ -72,7 +72,7 @@ protected SpawnResult spawn (IPlayer iPlayer) {
         Position pos = ((Player)iPlayer).getPosition();
         Level level = ((Player)iPlayer).getLevel();
         
-        if (this.spawnTask.entitySpawnAllowed(level, getEntityNetworkId())) {
+        if (this.spawnTask.entitySpawnAllowed(level, getEntityNetworkId(), getEntityName())) {
             if (pos != null) {
                 // get a random safe position for spawn
                 pos.x += this.spawnTask.getRandomSafeXZCoord(50, 26, 6);
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/BatSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/BatSpawner.java
@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.3, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Bat spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/ChickenSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/ChickenSpawner.java
@@ -43,7 +43,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.7, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Chicken spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/CowSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/CowSpawner.java
@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 2.3, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Cow spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/CreeperSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/CreeperSpawner.java
@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 2.8, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Creeper spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/EndermanSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/EndermanSpawner.java
@@ -51,7 +51,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 3.8, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Enderman spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/OcelotSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/OcelotSpawner.java
@@ -48,7 +48,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.9, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Ocelot spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/PigSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/PigSpawner.java
@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.9, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Pig spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/RabbitSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/RabbitSpawner.java
@@ -43,7 +43,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.75, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Rabbit spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/SheepSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/SheepSpawner.java
@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 2.3, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Sheep spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/SkeletonSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/SkeletonSpawner.java
@@ -43,7 +43,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 2.8, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, result));
+        FileLogger.info(String.format("Skeleton spawn for %s at %s,%s,%s with lightlevel %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/SpiderSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/SpiderSpawner.java
@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 2.12, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
+        FileLogger.info(String.format("Spider spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/WolfSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/WolfSpawner.java
@@ -44,7 +44,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.9, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %s,%s,%s with lightlevel %d and biomeId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, biomeId, result));
+        FileLogger.info(String.format("Wolf spawn for %s at %s,%s,%s with lightlevel %s and biomeId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, biomeId, result));
 
         return result;
     }
diff --git a/src/main/java/de/kniffo80/mobplugin/entities/spawners/ZombieSpawner.java b/src/main/java/de/kniffo80/mobplugin/entities/spawners/ZombieSpawner.java
@@ -44,7 +44,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {
             this.spawnTask.createEntity(getEntityName(), pos.add(0, 2.8, 0));
         }
 
-        FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, result));
+        FileLogger.info(String.format("Zombie spawn for %s at %s,%s,%s with lightlevel %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, result));
 
         return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,9 @@ private void prepareMaxSpawns() {`
`166`	`166`	`maxSpawns.get(Zombie.NETWORK_ID), maxSpawns.get(ZombieHorse.NETWORK_ID), maxSpawns.get(ZombieVillager.NETWORK_ID)));`
`167`	`167`	`}`
`168`	`168`
`169`		`- public boolean entitySpawnAllowed(Level level, int networkId) {`
	`169`	`+ public boolean entitySpawnAllowed(Level level, int networkId, String entityName) {`
`170`	`170`	`int count = countEntity(level, networkId);`
	`171`	`+ FileLogger.debug(String.format("Found %s/%s living %s", count, maxSpawns.get(networkId), entityName));`
`171`	`172`	`if (count < maxSpawns.get(networkId)) {`
`172`	`173`	`return true;`
`173`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {`
`45`	`45`	`this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.3, 0));`
`46`	`46`	`}`
`47`	`47`
`48`		`- FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
	`48`	`+ FileLogger.info(String.format("Bat spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
`49`	`49`
`50`	`50`	`return result;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {`
`43`	`43`	`this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.7, 0));`
`44`	`44`	`}`
`45`	`45`
`46`		`- FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
	`46`	`+ FileLogger.info(String.format("Chicken spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
`47`	`47`
`48`	`48`	`return result;`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {`
`51`	`51`	`this.spawnTask.createEntity(getEntityName(), pos.add(0, 3.8, 0));`
`52`	`52`	`}`
`53`	`53`
`54`		`- FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
	`54`	`+ FileLogger.info(String.format("Enderman spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
`55`	`55`
`56`	`56`	`return result;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public SpawnResult spawn(IPlayer iPlayer, Position pos, Level level) {`
`48`	`48`	`this.spawnTask.createEntity(getEntityName(), pos.add(0, 1.9, 0));`
`49`	`49`	`}`
`50`	`50`
`51`		`- FileLogger.info(String.format("Spawn for %s at %d,%d,%d with lightlevel %d and blockId %d, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
	`51`	`+ FileLogger.info(String.format("Ocelot spawn for %s at %s,%s,%s with lightlevel %s and blockId %s, result: %s", iPlayer.getName(), pos.x, pos.y, pos.z, blockLightLevel, blockId, result));`
`52`	`52`
`53`	`53`	`return result;`
`54`	`54`	`}`