Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-21 02:38:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0109-Ridables.patch
View File

@@ -4417,10 +4417,10 @@ index 96dda6a14fd17509e9bcb72cc7e9c8532c6a036b..3ea66955df304fd13aac2cf9bb93ea15
this.setTradingPlayer(entityhuman);
this.openTrade(entityhuman, this.getScoreboardDisplayName(), 1);
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
index 8f812aa9133e29d1450ab210fec68b23ca4d3042..9950bda50f405ce44f8fc8d95682e2522cf9e10f 100644
index 23b350f793539672b6990327ed52e9bb3bdbf54e..f1bc6a4199d788215c2e7d5a835211d16603a6d9 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -17,14 +17,28 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -18,14 +18,28 @@ public class EntityVindicator extends EntityIllagerAbstract {
super(entitytypes, world);
}
@@ -4798,10 +4798,10 @@ index e76e6ebde73b93dc06e76b71cdf6371c3654160a..d92fe8013fb3b43cb7eabdf1c624291b
this.eL();
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index a43f44bcf97b30d1cea2fb5d93e6949e41ab86fd..ba9b20863c12a1ba5a55013a74a34bc2fbc37273 100644
index 03263b94aaeeb8667e0f82c832e4743f4c63108e..d835ce3fe7c71333efeed5b9cf2a827bebae97f2 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -46,6 +46,16 @@ public class EntityZombie extends EntityMonster {
@@ -47,6 +47,16 @@ public class EntityZombie extends EntityMonster {
}
// Purpur start
@@ -4818,7 +4818,7 @@ index a43f44bcf97b30d1cea2fb5d93e6949e41ab86fd..ba9b20863c12a1ba5a55013a74a34bc2
public boolean jockeyOnlyBaby() {
return world.purpurConfig.zombieJockeyOnlyBaby;
}
@@ -61,9 +71,11 @@ public class EntityZombie extends EntityMonster {
@@ -62,9 +72,11 @@ public class EntityZombie extends EntityMonster {
@Override
protected void initPathfinder() {