Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

Update Pufferfish Entity TTL

Browse Source
This commit is contained in:
Dreeam
2023-07-25 12:39:55 +08:00
parent 4ded8385da
commit 7b3e0fae5c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0008-Pufferfish-Entity-TTL.patch
View File

@@ -7,22 +7,22 @@ Original license: GPL v3
Original project: https://github.com/pufferfish-gg/Pufferfish
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b818da9c6f0617b93ab5f5979c9fd4f3797bc7d8..df341e7c29ea5cc7807969c41c8f63e062daa90b 100644
index b818da9c6f0617b93ab5f5979c9fd4f3797bc7d8..f7a6e6557e60cc1ac685d07900f0bc75cda0d2b5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -841,6 +841,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
@@ -828,6 +828,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public void baseTick() {
public void tick() {
+ // Pufferfish start - entity TTL
+ if (type != EntityType.PLAYER && type.ttl >= 0 && this.tickCount >= type.ttl) {
+ remove(RemovalReason.DISCARDED);
+ discard();
+ return;
+ }
+ // Pufferfish end - entity TTL
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
this.baseTick();
}
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 1679f0a3d095a7b758b468c77b6d3a4c078b7962..aa5cec6d56d7a8e80861aa4c9b4a74ca3e64be8c 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java