Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a62238a99 Empty commands shall not be dispatched
60df44b11 Configurable door breaking difficulty

Tuinity Changes:
0d63fa009 Fix skylight propagation on top of non-empty sections again
This commit is contained in:
BillyGalbreath
2021-01-07 07:34:36 -06:00
parent b3644ccc61
commit 424fcf13bf
15 changed files with 49 additions and 184 deletions

View File

@@ -1181,10 +1181,10 @@ index 3ea66955df304fd13aac2cf9bb93ea156558ae57..32864e522b63d5d02c73a4df9f996c2e
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
index 9950bda50f405ce44f8fc8d95682e2522cf9e10f..894313f137578fa60faf80b36cff066d464d3897 100644
index f1bc6a4199d788215c2e7d5a835211d16603a6d9..2a137a90828f84de15a7184203c7d0dccc0851b4 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -27,6 +27,11 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -28,6 +28,11 @@ public class EntityVindicator extends EntityIllagerAbstract {
public boolean isRidableInWater() {
return world.purpurConfig.vindicatorRidableInWater;
}
@@ -1245,10 +1245,10 @@ index d92fe8013fb3b43cb7eabdf1c624291b7e881889..bcc4aa1d3f09e43016d0009cd04dd6b7
@Override
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 1c1816f6f08c2b02aba6db2e78863fabe83674d9..ea5a568509d5c44c3f15d8e813a554957784016b 100644
index 556f7a3ebb5c58a87471b2d098f29ffb216aaa1d..a5699314be3f47ed9b27a5d21a396c5282592c7b 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -67,6 +67,15 @@ public class EntityZombie extends EntityMonster {
@@ -68,6 +68,15 @@ public class EntityZombie extends EntityMonster {
public boolean jockeyTryExistingChickens() {
return world.purpurConfig.zombieJockeyTryExistingChickens;
}
@@ -1264,7 +1264,7 @@ index 1c1816f6f08c2b02aba6db2e78863fabe83674d9..ea5a568509d5c44c3f15d8e813a55495
// Purpur end
@Override
@@ -546,7 +555,7 @@ public class EntityZombie extends EntityMonster {
@@ -547,7 +556,7 @@ public class EntityZombie extends EntityMonster {
}
protected void eV() {