Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-17 20:10:10 +01:00
Code Issues Projekte Releases Wiki Aktivität

SPIGOT-5053: Initialize beacon with stored levels where available

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2019-06-10 19:09:51 +10:00
Ursprung b1c5fd6817
Commit 411609dc81
1 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
nms-patches/TileEntityBeacon.patch
Datei anzeigen

@ -119,7 +119,7 @@
public void a(SoundEffect soundeffect) { public void a(SoundEffect soundeffect) {
this.world.a((EntityHuman) null, this.position, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F); this.world.a((EntityHuman) null, this.position, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
} }
@@ -254,8 +309,10 @@ @@ -254,8 +309,11 @@
@Override @Override
public void load(NBTTagCompound nbttagcompound) { public void load(NBTTagCompound nbttagcompound) {
super.load(nbttagcompound); super.load(nbttagcompound);
@ -128,6 +128,7 @@
+ // Craftbukkit start - persist manually set non-default beacon effects (SPIGOT-3598) + // Craftbukkit start - persist manually set non-default beacon effects (SPIGOT-3598)
+ this.primaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Primary")); + this.primaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Primary"));
+ this.secondaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Secondary")); + this.secondaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Secondary"));
+ this.levels = nbttagcompound.getInt("Levels"); // SPIGOT-5053, use where available
+ // Craftbukkit end + // Craftbukkit end
if (nbttagcompound.hasKeyOfType("CustomName", 8)) { if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
this.customName = IChatBaseComponent.ChatSerializer.a(nbttagcompound.getString("CustomName")); this.customName = IChatBaseComponent.ChatSerializer.a(nbttagcompound.getString("CustomName"));