1358d1e914
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 881e06e5 PR-725: Add Item Unlimited Lifetime APIs CraftBukkit Changes: 74c08312 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall 64db5126 SPIGOT-6959: Make /loot command ignore empty items for spawn 2d760831 Increase outdated build delay 9ed7e4fb SPIGOT-6138, SPIGOT-6415: Don't call CreatureSpawnEvent after cross-dimensional travel fc4ad813 SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent 59733a2e SPIGOT-6961: Actually return a copy of the ItemMeta Spigot Changes: ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue e19ddabd PR-1011: Add Item Unlimited Lifetime APIs 34d40b0e SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 16 Jan 2022 10:34:02 -0800
|
|
Subject: [PATCH] Fix xp reward for baby zombies
|
|
|
|
The field that tracks the xpReward was not
|
|
getting reset if the death was cancelled
|
|
so this resets it after each call to
|
|
Zombie#getExperienceReward
|
|
|
|
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 da378373db05f7cf5e655bc76cb58945347d1f32..1954e1b179539be725c291cdda16fb17c8bcea47 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
|
@@ -172,11 +172,16 @@ public class Zombie extends Monster {
|
|
|
|
@Override
|
|
protected int getExperienceReward(Player player) {
|
|
+ final int previousReward = this.xpReward; // Paper - store previous value to reset after calculating XP reward
|
|
if (this.isBaby()) {
|
|
this.xpReward = (int) ((double) this.xpReward * 2.5D);
|
|
}
|
|
|
|
- return super.getExperienceReward(player);
|
|
+ // Paper start - only change the XP reward for the calculations in the super method
|
|
+ int reward = super.getExperienceReward(player);
|
|
+ this.xpReward = previousReward;
|
|
+ return reward;
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|