Craftbukkit -> CraftBukkit

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-02-02 11:18:17 +11:00
parent 0b8e05b835
commit 1705694b06
10 changed files with 17 additions and 17 deletions

View File

@@ -125,11 +125,11 @@
super.load(nbttagcompound);
- this.primaryEffect = b(nbttagcompound.getInt("Primary"));
- this.secondaryEffect = b(nbttagcompound.getInt("Secondary"));
+ // 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.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)) {
this.customName = IChatBaseComponent.ChatSerializer.a(nbttagcompound.getString("CustomName"));
}