mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
f17519338b
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
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
|
|
index f07cf6d91e0cbad80c3c630c0d505820e701ce81..3dc3609d13a7b823d15384d1c385b68eeb933d26 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/AgeableMob.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/AgeableMob.java
|
|
@@ -85,6 +85,7 @@ public abstract class AgeableMob extends PathfinderMob {
|
|
}
|
|
|
|
public void ageUp(int age, boolean overGrow) {
|
|
+ if (this.ageLocked) return; // Paper - Honor ageLock
|
|
int j = this.getAge();
|
|
int k = j;
|
|
|
|
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
|
|
index be91618d84be4a77b2f8a13e9b4024b5892c25e0..344b18127d3e8c7408a162cc85287382bdfdda9a 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
|
|
@@ -446,6 +446,7 @@ public class BeehiveBlockEntity extends BlockEntity {
|
|
}
|
|
|
|
private static void setBeeReleaseData(int ticksInHive, Bee beeEntity) {
|
|
+ if (!beeEntity.ageLocked) { // Paper - Honor ageLock
|
|
int j = beeEntity.getAge();
|
|
|
|
if (j < 0) {
|
|
@@ -455,6 +456,7 @@ public class BeehiveBlockEntity extends BlockEntity {
|
|
}
|
|
|
|
beeEntity.setInLoveTime(Math.max(0, beeEntity.getInLoveTime() - ticksInHive));
|
|
+ } // Paper - Honor ageLock
|
|
}
|
|
}
|
|
|