Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
ef0e5a642d
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: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
83 Zeilen
4.0 KiB
Diff
83 Zeilen
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 c6f203f95f70ca6286946e2ccc40de05d8eabc49..f1e471fee49d0213a97251be1b6793d5fb2165f2 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();
|
|
@@ -825,7 +826,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);
|
|
}
|
|
@@ -2261,6 +2262,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) {
|
|
@@ -2425,6 +2429,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();
|