PaperMC/patches/unapplied/server/0750-Fix-xp-reward-for-baby-zombies.patch

33 lines
1.3 KiB
Diff
Raw Normal View History

2022-01-16 20:15:16 +01:00
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 bcf31d0b784241b4f2b71bced4a431763d538a69..5fdad1600cc7a7c22d1d9a58b6b2dda605521b97 100644
2022-01-16 20:15:16 +01:00
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -175,11 +175,16 @@ public class Zombie extends Monster {
2022-01-16 20:15:16 +01:00
@Override
public int getExperienceReward() {
2022-01-16 20:15:16 +01:00
+ final int previousReward = this.xpReward; // Paper - store previous value to reset after calculating XP reward
if (this.isBaby()) {
2022-03-01 06:43:03 +01:00
this.xpReward = (int) ((double) this.xpReward * 2.5D);
2022-01-16 20:15:16 +01:00
}
- return super.getExperienceReward();
2022-01-16 20:15:16 +01:00
+ // Paper start - only change the XP reward for the calculations in the super method
+ int reward = super.getExperienceReward();
2022-01-16 20:15:16 +01:00
+ this.xpReward = previousReward;
+ return reward;
+ // Paper end
}
@Override