Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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

14
patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 905e54d53f7a209f538da1500df0d3dfa6e8c7ed..146b3d064829d38901c34e639d01d8d02b05f495 100644
index b119a3ce2a0907617c5e1f1071d640c8d4262f5f..3c8119aa55aa1fcd59e8b0d545d474bd100c674e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -149,7 +149,7 @@ import org.bukkit.plugin.PluginManager;
@@ -34,7 +34,7 @@ index 03adc3b746e05bb4b0514ba4a66c101b9742ceed..ec261673ac444fd5de9c8556cde5d788
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 46134547b26de59bb69c584df676bf09e756420e..dac5e52f2d86a9f4874cbaa2fdd6775d4b0566c1 100644
index 1a5587e25356a239ae6a8c219747fcd93491e741..85a6003ecadfabf47c06405f5b85bb71b5cd1e34 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -284,6 +284,7 @@ public abstract class LivingEntity extends Entity {
@@ -1099,7 +1099,7 @@ index a8c6971cc7d004bdc61a2b49e4542a8af46e8539..9448bdd5026f35bba805dee19ceead5d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index 8a3fcf98e4cb0a7473b198102c334e08696ab05c..92a5dc8a26bb6177634e5f1afb37f12828c70ace 100644
index 08935565ca3d1ee779abc491aa1e9eec13342bb5..3a3f5d6fb7ad5bb6082016c7415c25ab48405780 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -101,6 +101,30 @@ public class Slime extends Mob implements Enemy {
@@ -1271,7 +1271,7 @@ index 54a545836f3c318e7f90d43aca7fea8a6a56851d..fe315ebb69773d243feb2fbda369fc6f
@Override
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 d6ae8468f5d507b8278fa887d1d1770db212da0c..b8be8cf1b9052c770abef02e3f16c48b676851e8 100644
index ceb15697d28799064b3fab56b5f53b6249e81789..589ebb2f962c957903c12fc1a5304604f0433441 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -114,6 +114,11 @@ public class Zombie extends Monster {
@@ -1286,7 +1286,7 @@ index d6ae8468f5d507b8278fa887d1d1770db212da0c..b8be8cf1b9052c770abef02e3f16c48b
// Purpur end
@Override
@@ -586,7 +591,7 @@ public class Zombie extends Monster {
@@ -591,7 +596,7 @@ public class Zombie extends Monster {
}
protected void randomizeReinforcementsChance() {
@@ -1342,7 +1342,7 @@ index 2dec8be9b199e9bcf0970774afbd19a4861d802f..f30b36b3f1153e1cbd9b8242909d9ba8
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index 84969aa36add3b261b377c6b139313b153af4c46..e46a6bba628417c1b0795c477e649cfeca015647 100644
index 9e65970033249315b534441c80725683ce23ff0b..32836a16b18f4bb168d5a3d292765be33b998280 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -77,6 +77,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1358,7 +1358,7 @@ index 84969aa36add3b261b377c6b139313b153af4c46..e46a6bba628417c1b0795c477e649cfe
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 6d27e775cff2e70889ef3fc4646d46edb184fb71..862534112722a482cd5f69b346b69f3d46086359 100644
index 347244dcdea7ed3bb15dad4c0c5019ae9a1de9d1..70be752683291c34248ba7bafa42034f22fec9a9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -106,6 +106,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento