summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorblablubbabc <lukas@wirsindwir.de>2017-10-07 00:27:39 +0200
committermd_5 <git@md-5.net>2017-10-07 18:48:08 +1100
commitf8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb (patch)
treeed7b831a63e8de948651aa9e4a894f00032ca4b1 /nms-patches
parente8b6e4f29b5695fad110d8c08df0afcb2d5fc695 (diff)
downloadcraftbukkit-f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb.tar
craftbukkit-f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb.tar.gz
craftbukkit-f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb.tar.lz
craftbukkit-f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb.tar.xz
craftbukkit-f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb.zip
SPIGOT-3598: Persist all beacon effects
Regardless of if they are possible in Vanilla by default.
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/TileEntityBeacon.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/nms-patches/TileEntityBeacon.patch b/nms-patches/TileEntityBeacon.patch
index ccb0c5a6..a0e0edae 100644
--- a/nms-patches/TileEntityBeacon.patch
+++ b/nms-patches/TileEntityBeacon.patch
@@ -142,3 +142,16 @@
private void F() {
int i = this.position.getX();
+@@ -195,8 +272,10 @@
+
+ public void load(NBTTagCompound nbttagcompound) {
+ super.load(nbttagcompound);
+- this.primaryEffect = f(nbttagcompound.getInt("Primary"));
+- this.secondaryEffect = f(nbttagcompound.getInt("Secondary"));
++ // 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"));
++ // Craftbukkit end
+ this.levels = nbttagcompound.getInt("Levels");
+ }
+