mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-04 02:34:48 +02:00
83 lines
4.0 KiB
Diff
83 lines
4.0 KiB
Diff
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 d441db38210b15c6fae5a1632f4e2372c7a04b7c..ceddbc2e0fdec358bd7776af264df33696ecbd6d 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -402,6 +402,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();
|
|
@@ -833,7 +834,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);
|
|
}
|
|
@@ -2417,6 +2418,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) {
|
|
@@ -2582,6 +2586,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 b5996e86d2bfcb6d52b10c79bffb92d76954b714..d559d34524e84e7cb5a59756214eac6c9658bd87 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3417,7 +3417,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 d976796c6e80d8abc5c110bdefc09f63cfc4a60a..f61d3cd3cdbfe17f6818fbbb163f80ba3de50ca1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -669,6 +669,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();
|