From 64b8c63495187ad509ed8e98ee642f76548e68e0 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index ffcc235..35f4647 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.base.Charsets; +import com.google.common.base.Predicate; // Paper import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; import java.util.Arrays; @@ -65,6 +66,19 @@ public abstract class EntityHuman extends EntityLiving { private final ItemCooldown bW = this.l(); public EntityFishingHook hookedFish; + // Paper start - affectsSpawning API + public boolean affectsSpawning = true; + + public static Predicate affectsSpawningFilter() { + return new Predicate() { + @Override + public boolean apply(EntityHuman entityHuman) { + return entityHuman.affectsSpawning; + } + }; + } + // Paper end + // CraftBukkit start public boolean fauxSleeping; public String spawnWorld = ""; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 85d4b81..74aaba2 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -625,7 +625,7 @@ public abstract class EntityInsentient extends EntityLiving { if (this.persistent) { this.ticksFarFromPlayer = 0; } else { - EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); + EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D, EntityHuman.affectsSpawningFilter()); // Paper - affectsSpawning filter if (entityhuman != null) { double d0 = entityhuman.locX - this.locX; diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java index c4e5f50..d6c70c4 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -93,7 +93,7 @@ public class EntitySilverfish extends EntityMonster { public boolean cK() { if (super.cK()) { - EntityHuman entityhuman = this.world.b(this, 5.0D); + EntityHuman entityhuman = this.world.findNearbyPlayerNotInCreativeMode(this, 5.0D, EntityHuman.affectsSpawningFilter()); // Paper - affectsSpawning filter return entityhuman == null; } else { diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java index 3145bdc..6981185 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -197,7 +197,7 @@ public class EntityZombie extends EntityMonster { if (this.world.getType(new BlockPosition(i1, j1 - 1, k1)).q() && this.world.getLightLevel(new BlockPosition(i1, j1, k1)) < 10) { entityzombie.setPosition((double) i1, (double) j1, (double) k1); - if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { + if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D, EntityHuman.affectsSpawningFilter()) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { // Paper - affectsSpawning filter this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit entityzombie.setGoalTarget(entityliving, EntityTargetEvent.TargetReason.REINFORCEMENT_TARGET, true); entityzombie.prepare(this.world.D(new BlockPosition(entityzombie)), (GroupDataEntity) null); diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java index 7bae42a..f040775 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -32,7 +32,7 @@ public abstract class MobSpawnerAbstract { private boolean h() { BlockPosition blockposition = this.b(); - return this.a().isPlayerNearby((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, (double) this.requiredPlayerRange); + return this.a().isPlayerNearby((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, (double) this.requiredPlayerRange, EntityHuman.affectsSpawningFilter()); // Paper - affectsSpawning filter } public void c() { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java index f8a871d..55c36fc 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -50,6 +50,8 @@ public final class SpawnerCreature { while (iterator.hasNext()) { EntityHuman entityhuman = (EntityHuman) iterator.next(); + if (!entityhuman.affectsSpawning) continue; // Paper - affectsSpawning check + if (!entityhuman.isSpectator()) { int l = MathHelper.floor(entityhuman.locX / 16.0D); @@ -160,7 +162,7 @@ public final class SpawnerCreature { float f = (float) j3 + 0.5F; float f1 = (float) l3 + 0.5F; - if (!worldserver.isPlayerNearby((double) f, (double) k3, (double) f1, 24.0D) && blockposition.distanceSquared((double) f, (double) k3, (double) f1) >= 576.0D) { + if (!worldserver.isPlayerNearby((double) f, (double) k3, (double) f1, 24.0D, EntityHuman.affectsSpawningFilter()) && blockposition.distanceSquared((double) f, (double) k3, (double) f1) >= 576.0D) { // Paper - affectsSpawning filter if (biomebase_biomemeta == null) { biomebase_biomemeta = worldserver.a(enumcreaturetype, (BlockPosition) blockposition_mutableblockposition); if (biomebase_biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 3e79e02..e3d971c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3,6 +3,7 @@ import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Predicate; +import com.google.common.base.Predicates; // Paper import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Calendar; @@ -2713,16 +2714,31 @@ public abstract class World implements IBlockAccess { @Nullable public EntityHuman findNearbyPlayer(Entity entity, double d0) { - return this.a(entity.locX, entity.locY, entity.locZ, d0, false); + // Paper start - Add filter parameter + return findNearbyPlayer(entity, d0, Predicates.alwaysTrue()); + } + + public EntityHuman findNearbyPlayer(Entity entity, double d0, Predicate filter) { + return this.findNearbyPlayer(entity.locX, entity.locY, entity.locZ, d0, false, filter); } @Nullable public EntityHuman b(Entity entity, double d0) { - return this.a(entity.locX, entity.locY, entity.locZ, d0, true); + return this.findNearbyPlayerNotInCreativeMode(entity, d0, Predicates.alwaysTrue()); + } + + public EntityHuman findNearbyPlayerNotInCreativeMode(Entity entity, double d0, Predicate filter) { + return this.findNearbyPlayer(entity.locX, entity.locY, entity.locZ, d0, true, filter); } @Nullable public EntityHuman a(double d0, double d1, double d2, double d3, boolean flag) { + return findNearbyPlayer(d0, d1, d2, d3, flag, Predicates.alwaysTrue()); + } + + public EntityHuman findNearbyPlayer(double d0, double d1, double d2, double d3, boolean flag, Predicate filter) { + // FYI the flag means "exclude creative mode players" + // Paper end double d4 = -1.0D; EntityHuman entityhuman = null; @@ -2734,6 +2750,8 @@ public abstract class World implements IBlockAccess { } // CraftBukkit end + if (!filter.apply(entityhuman1)) continue; // Paper - check filter + if ((IEntitySelector.d.apply(entityhuman1) || !flag) && (IEntitySelector.e.apply(entityhuman1) || flag)) { double d5 = entityhuman1.e(d0, d1, d2); @@ -2748,9 +2766,17 @@ public abstract class World implements IBlockAccess { } public boolean isPlayerNearby(double d0, double d1, double d2, double d3) { + // Paper start - add filter parameter + return isPlayerNearby(d0, d1, d2, d3, Predicates.alwaysTrue()); + } + + public boolean isPlayerNearby(double d0, double d1, double d2, double d3, Predicate filter) { + // Paper end for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); + if (!filter.apply(entityhuman)) continue; // Paper - check filter + if (IEntitySelector.e.apply(entityhuman)) { double d4 = entityhuman.e(d0, d1, d2); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index d6cf997..f678d7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1427,6 +1427,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } + @Override + public void setAffectsSpawning(boolean affects) { + this.getHandle().affectsSpawning = affects; + } + + @Override + public boolean getAffectsSpawning() { + return this.getHandle().affectsSpawning; + } + // Spigot start private final Player.Spigot spigot = new Player.Spigot() { -- 2.9.0.windows.1