Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
cc0494817 Tick inactive goal selectors
c19ec6394 fix 4878 by always calling events using bukkit singleton
5d216be1d Fix MC-181190 curing zombie villager discount exploit (#4871)
This commit is contained in:
BillyGalbreath
2020-12-09 19:36:38 -06:00
parent ac346928eb
commit 59439785d9
60 changed files with 77 additions and 122 deletions

View File

@@ -8328,10 +8328,10 @@ index 957a351c3f..57166a543a 100644
this.setPersistent();
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 7ddf276732..23007c9ccb 100644
index dcc5b098bf..7b32a1fb79 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -707,7 +707,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -709,7 +709,13 @@ public abstract class EntityInsentient extends EntityLiving {
if (this.world.getDifficulty() == EnumDifficulty.PEACEFUL && this.L()) {
this.die();
} else if (!this.isPersistent() && !this.isSpecialPersistence()) {