Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-24 11:36:11 +01:00
Code Issues Projects Releases Wiki Activity

wiz makes a good point -- PROBABLY should not delete players.

Browse Source
This commit is contained in:
sk89q 2011-06-20 19:35:14 -07:00
parent c9f99e0903
commit 4f3198b1bd
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -125,7 +125,9 @@ public void onPlayerJoin(PlayerJoinEvent event) {
for (Entity entity : player.getWorld().getEntities()) { for (Entity entity : player.getWorld().getEntities()) {
if (entity instanceof Item if (entity instanceof Item
|| (entity instanceof LivingEntity && !(entity instanceof Tameable))) { || (entity instanceof LivingEntity
&& !(entity instanceof Tameable)
&& !(entity instanceof Player))) {
entity.remove(); entity.remove();
removed++; removed++;
} }

4
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java
View File

@ -51,7 +51,9 @@ public void onChunkLoad(ChunkLoadEvent event) {
for (Entity entity : event.getChunk().getEntities()) { for (Entity entity : event.getChunk().getEntities()) {
if (entity instanceof Item if (entity instanceof Item
|| (entity instanceof LivingEntity && !(entity instanceof Tameable))) { || (entity instanceof LivingEntity
&& !(entity instanceof Tameable)
&& !(entity instanceof Player))) {
entity.remove(); entity.remove();
removed++; removed++;
} }

4
src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java
View File

@ -116,7 +116,9 @@ public static void stopLag(CommandContext args, WorldGuardPlugin plugin,
for (Entity entity : world.getEntities()) { for (Entity entity : world.getEntities()) {
if (entity instanceof Item if (entity instanceof Item
|| (entity instanceof LivingEntity && !(entity instanceof Tameable))) { || (entity instanceof LivingEntity
&& !(entity instanceof Tameable)
&& !(entity instanceof Player))) {
entity.remove(); entity.remove();
removed++; removed++;
} }