2022-01-23 14:35:07 +01:00
|
|
|
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
|
2022-11-03 22:03:31 +01:00
|
|
|
index 305a70f4b4646fa6cb8f36af367222a2b7fa39d4..476668fe955841f61cf12d032b0d3bd1e400cd93 100644
|
2022-01-23 14:35:07 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2022-10-11 14:43:10 +02:00
|
|
|
@@ -396,6 +396,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2022-01-23 14:35:07 +01:00
|
|
|
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();
|
2022-10-11 14:43:10 +02:00
|
|
|
@@ -825,7 +826,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2022-01-23 14:35:07 +01:00
|
|
|
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);
|
|
|
|
}
|
2022-10-11 14:43:10 +02:00
|
|
|
@@ -2261,6 +2262,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2022-01-23 14:35:07 +01:00
|
|
|
if (fromNetherPortal) {
|
|
|
|
nbt.putBoolean("Paper.FromNetherPortal", true);
|
|
|
|
}
|
|
|
|
+ if (freezeLocked) {
|
|
|
|
+ nbt.putBoolean("Paper.FreezeLock", true);
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
return nbt;
|
|
|
|
} catch (Throwable throwable) {
|
2022-10-11 14:43:10 +02:00
|
|
|
@@ -2425,6 +2429,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2022-01-23 14:35:07 +01:00
|
|
|
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
|
2022-11-19 22:41:09 +01:00
|
|
|
index 8bf7d54cbdbc1dc2ec0482855d7f531b2dc648be..30013439192c9d32d3e1ebba5aec81140392d152 100644
|
2022-01-23 14:35:07 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2022-11-19 22:41:09 +01:00
|
|
|
@@ -3390,7 +3390,7 @@ public abstract class LivingEntity extends Entity {
|
2022-01-23 14:35:07 +01:00
|
|
|
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
- if (!this.level.isClientSide && !this.isDeadOrDying()) {
|
|
|
|
+ if (!this.level.isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
|
|
|
|
i = this.getTicksFrozen();
|
|
|
|
if (this.isInPowderSnow && this.canFreeze()) {
|
|
|
|
this.setTicksFrozen(Math.min(this.getTicksRequiredToFreeze(), i + 1));
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2022-10-11 14:43:10 +02:00
|
|
|
index 702d0fc5ebd2d39b038dae05135f551848544818..2015147126f463f11202d04ca475cc86e5ac12c2 100644
|
2022-01-23 14:35:07 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2022-09-12 13:31:45 +02:00
|
|
|
@@ -644,6 +644,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2022-01-23 14:35:07 +01:00
|
|
|
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();
|