From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sun, 26 Dec 2021 20:27:43 -0500 Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index bd8e756bf1e74cdc75cc12d2368a6fe702a759ad..25610f1100d64f542506cc6b3d4469a810254dc7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { private org.bukkit.util.Vector origin; @javax.annotation.Nullable private UUID originWorld; + public boolean freezeLocked = false; // Paper - Freeze Tick Lock API public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); @@ -826,7 +827,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setRemainingFireTicks(this.remainingFireTicks - 1); } - if (this.getTicksFrozen() > 0) { + if (this.getTicksFrozen() > 0 && !freezeLocked) { // Paper - Freeze Tick Lock API this.setTicksFrozen(0); this.level.levelEvent((Player) null, 1009, this.blockPosition, 1); } @@ -2297,6 +2298,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (fromNetherPortal) { nbt.putBoolean("Paper.FromNetherPortal", true); } + if (freezeLocked) { + nbt.putBoolean("Paper.FreezeLock", true); + } // Paper end return nbt; } catch (Throwable throwable) { @@ -2462,6 +2466,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (spawnReason == null) { spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; } + if (nbt.contains("Paper.FreezeLock")) { + freezeLocked = nbt.getBoolean("Paper.FreezeLock"); + } // Paper end } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 15c00d3dc8cab6968703d0420600aa77b2ffbec5..7fed29460309e1f35ee0207b4c07990201807bd1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3375,7 +3375,7 @@ public abstract class LivingEntity extends Entity implements Attackable { this.level.getProfiler().pop(); this.level.getProfiler().push("freezing"); - if (!this.level.isClientSide && !this.isDeadOrDying()) { + if (!this.level.isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API int i = this.getTicksFrozen(); if (this.isInPowderSnow && this.canFreeze()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 7ea5f911046fd05be8a997b07e6f66d69eaa9564..7df1eebce5b62214943e55314e9ec98f056fa330 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -663,6 +663,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.getHandle().isFullyFrozen(); } + // Paper Start - Freeze Tick Lock API + @Override + public boolean isFreezeTickingLocked() { + return this.entity.freezeLocked; + } + + @Override + public void lockFreezeTicks(boolean locked) { + this.entity.freezeLocked = locked; + } + // Paper end - Freeze Tick Lock API @Override public void remove() { this.entity.discard();