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
|
2024-05-16 02:06:59 +02:00
|
|
|
index b488fe4ddc8a4fad42f45b2a7158766df3a85de4..ce21885281a2bca8f363ebc6423ca65df7c13c6d 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
|
2024-04-24 19:59:51 +02:00
|
|
|
@@ -407,6 +407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
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();
|
2024-04-24 19:59:51 +02:00
|
|
|
@@ -777,7 +778,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
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
|
|
|
}
|
2024-04-24 19:59:51 +02:00
|
|
|
@@ -2274,6 +2275,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2022-01-23 14:35:07 +01:00
|
|
|
if (fromNetherPortal) {
|
2023-12-06 19:36:49 +01:00
|
|
|
nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
|
2022-01-23 14:35:07 +01:00
|
|
|
}
|
|
|
|
+ if (freezeLocked) {
|
2023-12-06 19:36:49 +01:00
|
|
|
+ nbttagcompound.putBoolean("Paper.FreezeLock", true);
|
2022-01-23 14:35:07 +01:00
|
|
|
+ }
|
|
|
|
// Paper end
|
2023-12-06 17:00:26 +01:00
|
|
|
return nbttagcompound;
|
2022-01-23 14:35:07 +01:00
|
|
|
} catch (Throwable throwable) {
|
2024-04-24 19:59:51 +02:00
|
|
|
@@ -2418,6 +2422,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
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
|
2024-05-16 02:06:59 +02:00
|
|
|
index dff6e07de4d447f7d7fe0107928ea0749714ba3e..4444e25adf854f2efdd8b29dba151d03070c3e8c 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
|
2024-04-28 03:00:01 +02:00
|
|
|
@@ -3464,7 +3464,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()) {
|
2023-12-06 17:00:26 +01:00
|
|
|
+ if (!this.level().isClientSide && !this.isDeadOrDying() && !this.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
|
2024-04-24 19:59:51 +02:00
|
|
|
index 97716f0a20fbc5f7048256ad1942e8f56e9fb72b..113ca1d16cb7650d72f488cdaa9e670d51dc85f0 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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -321,6 +321,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2022-01-23 14:35:07 +01:00
|
|
|
return this.getHandle().isFullyFrozen();
|
|
|
|
}
|
|
|
|
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Freeze Tick Lock API
|
2022-01-23 14:35:07 +01:00
|
|
|
+ @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() {
|
2023-12-06 17:00:26 +01:00
|
|
|
this.entity.pluginRemoved = true;
|