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
|
2023-09-23 01:38:10 +02:00
|
|
|
index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9b91b030c 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
|
2023-09-23 01:38:10 +02:00
|
|
|
@@ -401,6 +401,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();
|
2023-09-23 01:38:10 +02:00
|
|
|
@@ -800,7 +801,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);
|
2023-06-08 10:08:08 +02:00
|
|
|
this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
|
2022-01-23 14:35:07 +01:00
|
|
|
}
|
2023-09-23 01:38:10 +02:00
|
|
|
@@ -2400,6 +2401,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) {
|
2023-09-23 01:38:10 +02:00
|
|
|
@@ -2565,6 +2569,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
|
2023-10-29 00:50:26 +02:00
|
|
|
index 4e4cd3978499a363b16a2c2a0a81abef6bb6c815..7a530681bf043f4b335c16277cf07a7934afa8d9 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
|
2023-10-29 00:50:26 +02:00
|
|
|
@@ -3450,7 +3450,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2022-01-23 14:35:07 +01:00
|
|
|
|
2023-06-08 10:08:08 +02:00
|
|
|
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
|
2023-03-14 21:55:49 +01:00
|
|
|
int i = this.getTicksFrozen();
|
|
|
|
|
2022-01-23 14:35:07 +01:00
|
|
|
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
|
2023-10-03 13:55:12 +02:00
|
|
|
index 853561c0b3507808c70f4274812407d1ffb37504..c924ee182c150feca61deab9b8cc54806a23c49a 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
|
2023-09-23 04:06:03 +02:00
|
|
|
@@ -668,6 +668,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();
|