3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 04:20:04 +01:00

Persist ArmorStand canTick API value across restarts

Dieser Commit ist enthalten in:
Zach Brown 2018-11-27 18:40:56 -05:00
Ursprung cfe5920cab
Commit b82359ef5a
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: CC9DA35FC5450B76
2 geänderte Dateien mit 25 neuen und 6 gelöschten Zeilen

Datei anzeigen

@ -1,4 +1,4 @@
From 1ddf939a1e11ae48190c26bedd764bfa0c382fee Mon Sep 17 00:00:00 2001
From 6b1beefbc59949532cb4e66f634583d3fadc42a7 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 15 Aug 2018 01:26:09 -0700
Subject: [PATCH] Allow disabling armour stand ticking
@ -20,7 +20,7 @@ index c3bd8269..ed147535 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index df0d66ad..dca49707 100644
index df0d66ad..c7215888 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -51,6 +51,7 @@ public class EntityArmorStand extends EntityLiving {
@ -39,7 +39,26 @@ index df0d66ad..dca49707 100644
}
public EntityArmorStand(World world, double d0, double d1, double d2) {
@@ -568,6 +570,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -211,6 +213,7 @@ public class EntityArmorStand extends EntityLiving {
}
nbttagcompound.set("Pose", this.C());
+ nbttagcompound.setBoolean("Paper.CanTick", this.canTick); // Paper - persist no tick setting
}
public void a(NBTTagCompound nbttagcompound) {
@@ -242,6 +245,10 @@ public class EntityArmorStand extends EntityLiving {
this.setMarker(nbttagcompound.getBoolean("Marker"));
this.bC = !this.isMarker();
this.noclip = this.isNoGravity();
+ // Paper - persist no tick
+ if (nbttagcompound.hasKey("Paper.CanTick")) {
+ this.canTick = nbttagcompound.getBoolean("Paper.CanTick");
+ }
NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Pose");
this.g(nbttagcompound1);
@@ -568,6 +575,7 @@ public class EntityArmorStand extends EntityLiving {
}
public void B_() {

Datei anzeigen

@ -1,4 +1,4 @@
From 059e0ddf477c3fcf06ac7be0d347fb082c730573 Mon Sep 17 00:00:00 2001
From 2e5245ebec442569e203bd86dcc65a67539ad223 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Tue, 21 Aug 2018 01:39:35 +0100
Subject: [PATCH] Improve death events
@ -55,10 +55,10 @@ index 3a2ff25e..d44c55d8 100644
return SoundCategory.NEUTRAL;
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index dca49707..454c1e7d 100644
index c7215888..90749924 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -641,7 +641,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -646,7 +646,8 @@ public class EntityArmorStand extends EntityLiving {
}
public void killEntity() {