mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
22 lines
736 B
Diff
22 lines
736 B
Diff
From a41467f57d1d54423076d9bdb0755fcad6334971 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/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
|
|
index 1d7c998aa6..a11bdaadca 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
|
|
@@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature {
|
|
}
|
|
|
|
public void setAge(int i, boolean flag) {
|
|
+ if (ageLocked) return; // Paper - GH-1459
|
|
int j = this.getAge();
|
|
int k = j;
|
|
|
|
--
|
|
2.19.0
|
|
|