1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-Server-Patches/Add-option-to-disable-pillager-patrols.patch

@@ -19,7 +19,7 @@ index c37a0f035..3bbf77a8e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
-index 55fc19fdc..38de3a618 100644
+index 33488b37e..a0f582807 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 @@ -0,0 +0,0 @@ public class MobSpawnerPatrol {
@@ -29,5 +29,5 @@ index 55fc19fdc..38de3a618 100644
 +        if (worldserver.paperConfig.disablePillagerPatrols) return 0; // Paper
          if (!flag) {
              return 0;
-         } else {
+         } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) {
 --