PaperMC/patches/server/0265-Honor-EntityAgeable.ageLock.patch

39 lines
1.7 KiB
Diff
Raw Normal View History

2021-06-13 08:48:25 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 23 Sep 2018 20:59:53 -0500
Subject: [PATCH] Honor EntityAgeable.ageLock
diff --git a/src/main/java/net/minecraft/world/entity/AgeableMob.java b/src/main/java/net/minecraft/world/entity/AgeableMob.java
2021-12-30 20:44:39 +01:00
index 123b125a3576903767983c93135086ca7a8ea813..d165117d62fe8a55d624966e8c4b626c0f52db39 100644
2021-06-13 08:48:25 +02:00
--- a/src/main/java/net/minecraft/world/entity/AgeableMob.java
+++ b/src/main/java/net/minecraft/world/entity/AgeableMob.java
@@ -84,6 +84,7 @@ public abstract class AgeableMob extends PathfinderMob {
}
public void ageUp(int age, boolean overGrow) {
2021-12-30 20:44:39 +01:00
+ if (this.ageLocked) return; // Paper - GH-1459
2021-06-13 08:48:25 +02:00
int j = this.getAge();
int k = j;
2021-12-30 20:44:39 +01:00
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
2022-03-01 06:43:03 +01:00
index afe4991fb69fa303279a4e46d730f482e8a58f01..e4e879cdfe7d257161bf8e98305c0f2e9b9539f9 100644
2021-12-30 20:44:39 +01:00
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
2022-03-01 06:43:03 +01:00
@@ -296,6 +296,7 @@ public class BeehiveBlockEntity extends BlockEntity {
2021-12-30 20:44:39 +01:00
}
private static void setBeeReleaseData(int ticks, Bee bee) {
+ if (!bee.ageLocked) { // Paper - respect age lock
int j = bee.getAge();
if (j < 0) {
2022-03-01 06:43:03 +01:00
@@ -303,6 +304,7 @@ public class BeehiveBlockEntity extends BlockEntity {
2021-12-30 20:44:39 +01:00
} else if (j > 0) {
bee.setAge(Math.max(0, j - ticks));
}
+ } // Paper - respect age lock
bee.setInLoveTime(Math.max(0, bee.getInLoveTime() - ticks));
}