Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #266

Browse Source
This commit is contained in:
boy0001 2015-04-15 00:35:01 +10:00
parent 964fd0f5e9
commit e93634622c
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
View File

@ -39,6 +39,7 @@ import org.bukkit.entity.Creature;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Vehicle;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -878,7 +879,7 @@ public class BukkitChunkManager extends ChunkManager {
@Override @Override
public int[] countEntities(Plot plot) { public int[] countEntities(Plot plot) {
int[] count = new int[3]; int[] count = new int[5];
World world = BukkitUtil.getWorld(plot.world); World world = BukkitUtil.getWorld(plot.world);
Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1); Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
@ -909,7 +910,7 @@ public class BukkitChunkManager extends ChunkManager {
if (doWhole) { if (doWhole) {
for (final Entity entity : entities) { for (final Entity entity : entities) {
if (!(entity instanceof Creature)) { if (!(entity instanceof Creature || entity instanceof Vehicle)) {
continue; continue;
} }
org.bukkit.Location loc = entity.getLocation(); org.bukkit.Location loc = entity.getLocation();
@ -918,24 +919,12 @@ public class BukkitChunkManager extends ChunkManager {
int X = chunk.getX(); int X = chunk.getX();
int Z = chunk.getX(); int Z = chunk.getX();
if (X > bx && X < tx && Z > bz && Z < tz) { if (X > bx && X < tx && Z > bz && Z < tz) {
count[0]++; count(count, entity);
if (entity instanceof Animals) {
count[1]++;
}
else {
count[2]++;
}
} }
else { else {
final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(loc)); final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(loc));
if (plot.id.equals(id)) { if (plot.id.equals(id)) {
count[0]++; count(count, entity);
if (entity instanceof Animals) {
count[1]++;
}
else {
count[2]++;
}
} }
} }
} }
@ -947,33 +936,38 @@ public class BukkitChunkManager extends ChunkManager {
int Z = chunk.getX(); int Z = chunk.getX();
Entity[] ents = chunk.getEntities(); Entity[] ents = chunk.getEntities();
for (final Entity entity : ents) { for (final Entity entity : ents) {
if (!(entity instanceof Creature)) { if (!(entity instanceof Creature || entity instanceof Vehicle)) {
continue; continue;
} }
if (X == bx || X == tx || Z == bz || Z == tz) { if (X == bx || X == tx || Z == bz || Z == tz) {
final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(entity)); final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(entity));
if (plot.id.equals(id)) { if (plot.id.equals(id)) {
count[0]++; count(count, entity);
if (entity instanceof Animals) {
count[1]++;
}
else {
count[2]++;
}
} }
} }
else { else {
count[0]++; count(count, entity);
if (entity instanceof Animals) {
count[1]++;
}
else {
count[2]++;
}
} }
} }
} }
} }
return count; return count;
} }
private void count(int[] count, Entity entity) {
count[0]++;
if (entity instanceof Creature) {
count[3]++;
if (entity instanceof Animals) {
count[1]++;
}
else {
count[2]++;
}
}
else {
count[4]++;
}
}
} }