ef170ee659
--- work/Bukkit Submodule work/Bukkit 6eac6d70..1ef8b9d9: > Add Player#openBook(ItemStack) method --- work/CraftBukkit Submodule work/CraftBukkit 17543ecf..649921e5: > Add Player#openBook(ItemStack) method > SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full > SPIGOT-5037: Player.openMerchant does not show merchant level > SPIGOT-5038: Inventory.getHolder returns null for wandering traders --- work/Spigot Submodule work/Spigot baafee91..df0eb250: > SPIGOT-5043: Desync if world is changed in PlayerSpawnLocationEvent > Rebuild patches Implementation developer note: This patch adds a "pre-source" patch system for fixing malformed patches from upstream directly. This seems to keep happening so it's best we have some way to deal with them. This system brings those issues into our domain rather than needing to wait for upstream to fix their malformed files.
73 lines
3.1 KiB
Diff
73 lines
3.1 KiB
Diff
From e5c52b95bdb225b07ff4602552e42d112de72694 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 28791cca9..418e2fccd 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving {
|
|
private final ItemCooldown bY;
|
|
@Nullable
|
|
public EntityFishingHook hookedFish;
|
|
+ // Paper start
|
|
+ public boolean affectsSpawning = true;
|
|
+ // Paper end
|
|
|
|
// CraftBukkit start
|
|
public boolean fauxSleeping;
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
index d020414f9..0ecbf873b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
@@ -609,7 +609,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
|
if (!this.isPersistent() && !this.I()) {
|
|
EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
|
|
|
|
- if (entityhuman != null) {
|
|
+ if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
|
|
double d0 = entityhuman.h(this);
|
|
|
|
if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
|
|
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
|
index dbbc34d91..d823c6b6d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
|
|
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
|
@@ -106,7 +106,7 @@ public class EntitySilverfish extends EntityMonster {
|
|
if (super.a(generatoraccess, enummobspawn)) {
|
|
EntityHuman entityhuman = this.world.a(EntitySilverfish.b, (EntityLiving) this);
|
|
|
|
- return entityhuman == null;
|
|
+ return !(entityhuman != null && !entityhuman.affectsSpawning) && entityhuman == null; // Paper - Affects Spawning API
|
|
} else {
|
|
return false;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 037b0bc68..76728b178 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1642,7 +1642,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
@Override
|
|
public String getLocale() {
|
|
return getHandle().locale;
|
|
+
|
|
+ }
|
|
+
|
|
+ // Paper start
|
|
+ public void setAffectsSpawning(boolean affects) {
|
|
+ this.getHandle().affectsSpawning = affects;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean getAffectsSpawning() {
|
|
+ return this.getHandle().affectsSpawning;
|
|
}
|
|
+ // Paper end
|
|
|
|
@Override
|
|
public void updateCommands() {
|
|
--
|
|
2.21.0
|
|
|