aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0806-Freeze-Tick-Lock-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0806-Freeze-Tick-Lock-API.patch')
-rw-r--r--patches/server/0806-Freeze-Tick-Lock-API.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/patches/server/0806-Freeze-Tick-Lock-API.patch b/patches/server/0806-Freeze-Tick-Lock-API.patch
new file mode 100644
index 0000000000..99aa867eaa
--- /dev/null
+++ b/patches/server/0806-Freeze-Tick-Lock-API.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+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 8958c95105394601ca91b4318b598e45ced9e706..fd536e670036a365f6d0e8c168ef4b5fdf597615 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);
+ }
+@@ -2262,6 +2263,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) {
+@@ -2426,6 +2430,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 d6ecdeab398d7bfde3d760ada0374245f03014b3..73d931489c76f2effe71362a46a69087a1a09463 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -3376,7 +3376,7 @@ public abstract class LivingEntity extends Entity {
+ 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
+index 385368d0c6a13f9b1b907bcc48d1fb2a845262ef..c4ffccddce33cf461d9b04ccbb90026544f16b7d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -644,6 +644,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();