Paper/patches/server/0777-Freeze-Tick-Lock-API.patch

83 lines
4.0 KiB
Diff
Raw Normal View History

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-06-09 01:21:20 +02:00
index ef5e979d09df13660ac7893be1209c2c2b8a136c..dc676cdabfa306a3975e25f981078ead317196c1 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-06-09 01:21:20 +02:00
@@ -402,6 +402,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-06-09 01:21:20 +02:00
@@ -833,7 +834,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-06-09 01:21:20 +02:00
@@ -2417,6 +2418,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-06-09 01:21:20 +02:00
@@ -2582,6 +2586,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-06-09 01:12:34 +02:00
index 0ebb1e0ea091a6a0334f8c53f8ed11d5944d3670..3150f04897488c9bf60fe8921111377c72c063e5 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-06-08 10:08:08 +02:00
@@ -3424,7 +3424,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
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-06-08 21:35:20 +02:00
index 428795adbd9e08353196ab78730e6dc6984011e7..8317d5100d16fb242e4ff9f7b965e1dbd147cede 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
@@ -663,6 +663,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();