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

@@ -112,10 +112,10 @@ index 9f4f56c47e..8dce2aad77 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 23007c9ccb..ba4a2bcfa0 100644
index 7b32a1fb79..b281ca841b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -946,6 +946,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -948,6 +948,7 @@ public abstract class EntityInsentient extends EntityLiving {
return f;
}
@@ -123,7 +123,7 @@ index 23007c9ccb..ba4a2bcfa0 100644
protected void a(DifficultyDamageScaler difficultydamagescaler) {
if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
int i = this.random.nextInt(2);
@@ -1053,6 +1054,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1055,6 +1056,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
}
@@ -131,7 +131,7 @@ index 23007c9ccb..ba4a2bcfa0 100644
protected void b(DifficultyDamageScaler difficultydamagescaler) {
float f = difficultydamagescaler.d();
@@ -1094,10 +1096,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1096,10 +1098,12 @@ public abstract class EntityInsentient extends EntityLiving {
} else {
this.setLeftHanded(false);
}