Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@36ce000 Fix xp reward for baby zombies (#7353)
PaperMC/Paper@5c74af2 Fix NPE for bucket empty result stack being null (#7354)
This commit is contained in:
BillyGalbreath
2022-01-16 16:45:56 -06:00
parent 84028e28a5
commit 6b6cd23d7e
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0072-Configurable-jockey-options.patch
View File

@@ -57,7 +57,7 @@ index 81a3f6c1774b187be96b412dae44be623ce7f6cb..7bb8ef0bb2de9a0b0d5048f8a4089835
public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index b8be8cf1b9052c770abef02e3f16c48b676851e8..26ba3700d7c6f2502ab8fa8698430e7bbd2572dd 100644
index 589ebb2f962c957903c12fc1a5304604f0433441..c6ecf05dedeef70fb4aad55c6c8455fb7b69ab46 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -119,6 +119,18 @@ public class Zombie extends Monster {
@@ -79,7 +79,7 @@ index b8be8cf1b9052c770abef02e3f16c48b676851e8..26ba3700d7c6f2502ab8fa8698430e7b
// Purpur end
@Override
@@ -525,19 +537,20 @@ public class Zombie extends Monster {
@@ -530,19 +542,20 @@ public class Zombie extends Monster {
if (object instanceof Zombie.ZombieGroupData) {
Zombie.ZombieGroupData entityzombie_groupdatazombie = (Zombie.ZombieGroupData) object;
@@ -106,7 +106,7 @@ index b8be8cf1b9052c770abef02e3f16c48b676851e8..26ba3700d7c6f2502ab8fa8698430e7b
Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level);
entitychicken1.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F);
@@ -545,6 +558,7 @@ public class Zombie extends Monster {
@@ -550,6 +563,7 @@ public class Zombie extends Monster {
entitychicken1.setChickenJockey(true);
this.startRiding(entitychicken1);
world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit