Archiviert
13
0
Dieses Repository wurde am 2024-12-25 archiviert. Du kannst Dateien ansehen und es klonen, aber nicht pushen oder Issues/Pull-Requests öffnen.
Paper-Old/patches/server/0836-Freeze-Tick-Lock-API.patch

83 Zeilen
4.0 KiB
Diff

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
2022-07-27 23:32:15 +02:00
index ccef7676eee4024885fee3c6350410100a97c748..473b7c0bd9c49192041e3a6e4c8a9d760344a44a 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
@@ -397,6 +397,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();
@@ -825,7 +826,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);
this.level.levelEvent((Player) null, 1009, this.blockPosition, 1);
}
2022-07-27 23:32:15 +02:00
@@ -2247,6 +2248,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) {
2022-07-27 23:32:15 +02:00
@@ -2411,6 +2415,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
2022-07-27 23:32:15 +02:00
index 8dc54061802f0253193bda79bded1d5265591519..44c0f77bdeeb9061b1dfcd904ed2c63910e30e42 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
2022-07-27 23:32:15 +02:00
@@ -3354,7 +3354,7 @@ public abstract class LivingEntity extends Entity {
2022-01-23 14:35:07 +01:00
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 e12dcc33e859950efec36b91ad9a43e435545d5b..2a6c67634c31c332102d24bef293da1bacd0c000 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
@@ -673,6 +673,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();