From f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb Mon Sep 17 00:00:00 2001
From: blablubbabc <lukas@wirsindwir.de>
Date: Sat, 7 Oct 2017 00:27:39 +0200
Subject: [PATCH] SPIGOT-3598: Persist all beacon effects

Regardless of if they are possible in Vanilla by default.
---
 nms-patches/TileEntityBeacon.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nms-patches/TileEntityBeacon.patch b/nms-patches/TileEntityBeacon.patch
index ccb0c5a61e..a0e0edae9c 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");
+     }
+