From e5b0d45ff6ee87d1125f3420dcbe8e159f467800 Mon Sep 17 00:00:00 2001
From: granny <pkrok01@outlook.com>
Date: Wed, 9 Jun 2021 04:05:23 -0700
Subject: [PATCH] [ci-skip] remove duplicate beaconLevelThree

---
 .../server/0222-Beacon-Activation-Range-Configurable.patch   | 5 ++---
 patches/server/0223-Add-toggle-for-sand-duping-fix.patch     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/patches/server/0222-Beacon-Activation-Range-Configurable.patch b/patches/server/0222-Beacon-Activation-Range-Configurable.patch
index 2ab4a4a8b..acdc626d4 100644
--- a/patches/server/0222-Beacon-Activation-Range-Configurable.patch
+++ b/patches/server/0222-Beacon-Activation-Range-Configurable.patch
@@ -26,10 +26,10 @@ index f7b210e6d60533d9faf60183a80a562b25f945d0..926e1344a8db4b18caebae77096c2600
          } else {
              return effectRange;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f27c55d8d6dabe7d2cbaf6ab01e1a484e1d96f53..e72bc4d81e528885dfb129b4718123afa5c16421 100644
+index f27c55d8d6dabe7d2cbaf6ab01e1a484e1d96f53..69b158b2f0f6d3c11144e5b312ca92d970c791a3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -511,6 +511,18 @@ public class PurpurWorldConfig {
+@@ -511,6 +511,17 @@ public class PurpurWorldConfig {
          anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
      }
  
@@ -41,7 +41,6 @@ index f27c55d8d6dabe7d2cbaf6ab01e1a484e1d96f53..e72bc4d81e528885dfb129b4718123af
 +        beaconLevelOne = getInt("blocks.beacon.effect-range.level-1", beaconLevelOne);
 +        beaconLevelTwo = getInt("blocks.beacon.effect-range.level-2", beaconLevelTwo);
 +        beaconLevelThree = getInt("blocks.beacon.effect-range.level-3", beaconLevelThree);
-+        beaconLevelThree = getInt("blocks.beacon.effect-range.level-3", beaconLevelThree);
 +        beaconLevelFour = getInt("blocks.beacon.effect-range.level-4", beaconLevelFour);
 +    }
 +
diff --git a/patches/server/0223-Add-toggle-for-sand-duping-fix.patch b/patches/server/0223-Add-toggle-for-sand-duping-fix.patch
index 5a74d6850..a60d35713 100644
--- a/patches/server/0223-Add-toggle-for-sand-duping-fix.patch
+++ b/patches/server/0223-Add-toggle-for-sand-duping-fix.patch
@@ -27,10 +27,10 @@ index 2a61c24dd26edf4c72e977c6024fe233bab08a2f..58d14c70a95057e91766cc6aa0601331
              }
              // Paper end - fix sand duping
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e72bc4d81e528885dfb129b4718123afa5c16421..f09d10021f2a20331f5ca4898c7c8b39e32ed2d4 100644
+index 69b158b2f0f6d3c11144e5b312ca92d970c791a3..bd434559414a209db9e13c49303cab4a9f84ac15 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -642,6 +642,11 @@ public class PurpurWorldConfig {
+@@ -641,6 +641,11 @@ public class PurpurWorldConfig {
          }
      }