2017-04-11 05:11:26 +02:00
|
|
|
From 3cba9d06727dbd8332e08f22fa33572434be2c51 Mon Sep 17 00:00:00 2001
|
2016-11-17 03:23:38 +01:00
|
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
|
|
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
|
2017-03-25 04:18:58 +01:00
|
|
|
index ec8f581ad..43e28d61c 100644
|
2016-11-17 03:23:38 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
|
|
private final ItemCooldown bV;
|
|
|
|
@Nullable
|
|
|
|
public EntityFishingHook hookedFish;
|
2016-11-19 01:55:14 +01:00
|
|
|
+ public boolean affectsSpawning = true;
|
2016-11-17 03:23:38 +01:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
public boolean fauxSleeping;
|
2016-11-19 01:55:14 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2017-04-11 05:11:26 +02:00
|
|
|
index a9e3b632b..1d26555d3 100644
|
2016-11-19 01:55:14 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2017-04-11 05:11:26 +02:00
|
|
|
@@ -618,7 +618,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
2016-11-19 01:55:14 +01:00
|
|
|
} else {
|
|
|
|
EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
|
2016-11-17 03:23:38 +01:00
|
|
|
|
2016-11-19 01:55:14 +01:00
|
|
|
- if (entityhuman != null) {
|
|
|
|
+ if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
|
|
|
|
double d0 = entityhuman.locX - this.locX;
|
|
|
|
double d1 = entityhuman.locY - this.locY;
|
|
|
|
double d2 = entityhuman.locZ - this.locZ;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
2017-03-25 04:18:58 +01:00
|
|
|
index 5af51cc0a..7531c9ba9 100644
|
2016-11-19 01:55:14 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
|
|
|
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
|
|
|
|
public boolean cM() {
|
|
|
|
if (super.cM()) {
|
|
|
|
EntityHuman entityhuman = this.world.b(this, 5.0D);
|
|
|
|
-
|
|
|
|
- return entityhuman == null;
|
|
|
|
+ return !(entityhuman != null && !entityhuman.affectsSpawning) && entityhuman == null; // Paper - Affects Spawning API
|
|
|
|
} else {
|
|
|
|
return false;
|
2016-11-17 03:23:38 +01:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
2017-04-11 05:11:26 +02:00
|
|
|
index b23c0be2a..e42a0c776 100644
|
2016-11-17 03:23:38 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
|
|
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
EntityHuman entityhuman = (EntityHuman) iterator.next();
|
|
|
|
|
|
|
|
- if (!entityhuman.isSpectator()) {
|
2016-11-19 01:55:14 +01:00
|
|
|
+ if (!entityhuman.isSpectator() && entityhuman.affectsSpawning) {
|
2016-11-17 03:23:38 +01:00
|
|
|
int l = MathHelper.floor(entityhuman.locX / 16.0D);
|
|
|
|
|
|
|
|
j = MathHelper.floor(entityhuman.locZ / 16.0D);
|
2016-11-19 01:55:14 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2017-03-25 04:18:58 +01:00
|
|
|
index edd6c3b5e..751fc01d1 100644
|
2016-11-19 01:55:14 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2017-03-25 04:18:58 +01:00
|
|
|
@@ -2722,7 +2722,7 @@ public abstract class World implements IBlockAccess {
|
2016-11-19 01:55:14 +01:00
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
|
|
|
|
|
|
|
|
- if (IEntitySelector.e.apply(entityhuman)) {
|
|
|
|
+ if (IEntitySelector.e.apply(entityhuman) && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
|
|
|
|
double d4 = entityhuman.d(d0, d1, d2);
|
|
|
|
|
|
|
|
if (d3 < 0.0D || d4 < d3 * d3) {
|
2016-11-17 03:23:38 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2017-04-01 06:24:42 +02:00
|
|
|
index b56ae7a36..6509df573 100644
|
2016-11-17 03:23:38 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2017-04-01 06:24:42 +02:00
|
|
|
@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2016-11-17 03:23:38 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
+ @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()
|
|
|
|
{
|
|
|
|
--
|
2017-04-01 06:24:42 +02:00
|
|
|
2.12.1.windows.1
|
2016-11-17 03:23:38 +01:00
|
|
|
|