Add callEvent shortcut to Event

BungeeCord-Patches/0028-Add-callEvent-shortcut-to-Event.patch

@@ -0,0 +1,32 @@
+From 6a5a9d5c523d1d6d5e9f12a0e219142280e834a8 Mon Sep 17 00:00:00 2001
+From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
+Date: Sun, 14 Apr 2019 19:15:00 +0300
+Subject: [PATCH] Add callEvent() shortcut to Event
+
+
+diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/Event.java b/api/src/main/java/net/md_5/bungee/api/plugin/Event.java
+index e2e01ecb..25ec1bd8 100644
+--- a/api/src/main/java/net/md_5/bungee/api/plugin/Event.java
++++ b/api/src/main/java/net/md_5/bungee/api/plugin/Event.java
+@@ -12,4 +12,18 @@ public abstract class Event
+     public void postCall()
+     {
+     }
++    // Waterfall start - Add callEvent() shortcut, borrowed from PaperMC/Paper
++    /**
++     * Calls the event and tests if cancelled.
++     *
++     * @return false if event was cancelled, if cancellable. otherwise true.
++     */
++    public final boolean callEvent() {
++        net.md_5.bungee.api.ProxyServer.getInstance().getPluginManager().callEvent(this);
++        if (this instanceof Cancellable) {
++            return !((Cancellable) this).isCancelled();
++        }
++        return true;
++    }
++    // Waterfall end
+ }
+-- 
+2.24.0
+

BungeeCord-Patches/0029-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From e8cac6c7be6c38685faf8881d5206986020099f7 Mon Sep 17 00:00:00 2001
+From 930ffdff589d30cd8cfc15b398bf70b1cf2b5906 Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -146,5 +146,5 @@ index 2eff743d..034040a0 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0030-Configurable-server-version-in-ping-response.patch

@@ -1,4 +1,4 @@
-From decc1bf40862deeb8d038607398fa2b368721f10 Mon Sep 17 00:00:00 2001
+From f021efcef99484823fbed75a007b134c9769fbf3 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response
@@ -79,5 +79,5 @@ index 0ff6781c..083bc177 100644
  
      @Override
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0031-Add-timeout-variant-to-connect-methods.patch

@@ -1,4 +1,4 @@
-From 42ae04c40ab75963abdae8eb5f970aa109c30ae7 Mon Sep 17 00:00:00 2001
+From e86199307b640cdc3f09f5c0b3598bb0213f4c03 Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add timeout variant to connect methods
 Also added more connect methods to ProxiedPlayer, in addition to the new method
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
-index e3e999b0..de09cd54 100644
+index 867e4428..f7459860 100644
 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
 +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
 @@ -111,6 +111,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -75,7 +75,7 @@ index e3e999b0..de09cd54 100644
       * Connects / transfers this user to the specified connection, gracefully
       * closing the current one. Depending on the implementation, this method
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index 6843fd8b..6dae9a88 100644
+index 644522b1..f3466956 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -109,5 +109,5 @@ index 6843fd8b..6dae9a88 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
 -- 
-2.19.1
+2.24.0
 

BungeeCord-Patches/0032-Proxy-query-event.patch

@@ -1,4 +1,4 @@
-From 8c80ae6e41922c2347dd89527701619e5721a9e3 Mon Sep 17 00:00:00 2001
+From d849f888b91b373c86660bfda66bf8a31feb3a87 Mon Sep 17 00:00:00 2001
 From: minecrafter <unknown@unknown>
 Date: Sun, 3 Jul 2016 04:03:21 -0400
 Subject: [PATCH] Proxy query event
@@ -211,5 +211,5 @@ index 9b81197f..ac99d02c 100644
              } else
              {
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0033-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch

@@ -1,4 +1,4 @@
-From 869e9709c7620421752a819171b4509a4efc999e Mon Sep 17 00:00:00 2001
+From bf20d24559bf3db47ae4603e5f8a5f052668e72d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error
@@ -53,5 +53,5 @@ index 5b32effe..9e9ea49c 100644
          {
              if ( slice != null )
 -- 
-2.19.1
+2.24.0
 

BungeeCord-Patches/0034-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,4 +1,4 @@
-From 42d7f2f7231893a6a067131d59635ef6c0580102 Mon Sep 17 00:00:00 2001
+From 70385f459bf33a77b6d9b5bdfaead134c87d9059 Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@@ -275,5 +275,5 @@ index 0d683856..c1272da3 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0035-Optionally-use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From b6c3ccafa8e2479faa7bb5077b90219a4d20ff69 Mon Sep 17 00:00:00 2001
+From eaf7f322c0f65d3a7168b49901b94c6fdaee75e0 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Optionally use async Netty DNS resolver
@@ -183,5 +183,5 @@ index 6c418567..23241d68 100644
          return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
      }
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0036-Improve-outdated-build-message.patch

@@ -1,4 +1,4 @@
-From ccf2d098264af3f6482da258d2e1ccc3288d192d Mon Sep 17 00:00:00 2001
+From 3e62abd6465ce419209e248223c5622cb9c9427d Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
@@ -22,5 +22,5 @@ index 4ba0ced5..4c119b9d 100644
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
              }
 -- 
-2.22.0
+2.24.0
 

BungeeCord-Patches/0037-Fix-some-forge-plugin-message-packets-not-being-forw.patch

@@ -1,4 +1,4 @@
-From 0bcddf3f2a54189e017bb728c4486f65dd691a8b Mon Sep 17 00:00:00 2001
+From 6c079814560d12b3646a5b34083fddccf6f04777 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Mon, 17 Jul 2017 20:24:17 +0100
 Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@@ -55,5 +55,5 @@ index 7166d061..b5b9ec70 100644
              synchronized ( packetQueue )
              {
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0038-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 40173bfdf3193d6b393cfab6df0fcf4fdfb7f417 Mon Sep 17 00:00:00 2001
+From 4406b903bea747d93a8d5e5e5cd0c8e9abc1d648 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0039-Handle-plugin-prefixes-using-Log4J.patch

@@ -1,4 +1,4 @@
-From dd4a2d58e7fed567f62254f3ab6ed95dbf7a6159 Mon Sep 17 00:00:00 2001
+From 70c91e73a4cca638bfdc7291d6398c11d4632598 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:07:31 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J
@@ -45,5 +45,5 @@ index 93ce3b14..3b3525f0 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.19.1
+2.24.0
 

BungeeCord-Patches/0040-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,11 +1,11 @@
-From 69003951e257d6df87d6baec5650bc65bdac6b62 Mon Sep 17 00:00:00 2001
+From 08581c8b99aff9e68af6efe1eff049fa0c20e84c Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
 
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 48bd8a54..0e46cbbe 100644
+index f0348e13..b79d7ed6 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -43,5 +43,12 @@
@@ -39,7 +39,7 @@ index e85b4914..2e5ae4fb 100644
       * Called when the plugin has just been loaded. Most of the proxy will not
       * be initialized, so only use it for registering
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index e27b582f..33f1b659 100644
+index f019aaaf..75dab185 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -38,6 +38,12 @@
@@ -56,5 +56,5 @@ index e27b582f..33f1b659 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.19.1
+2.24.0
 

BungeeCord-Patches/0041-Add-Log4j-configuration-that-replicates-the-old-Bung.patch

@@ -1,4 +1,4 @@
-From 3f21e3db1dd0b0697a6562193be8bab9e9f0a78e Mon Sep 17 00:00:00 2001
+From 644d8176535454cdb75758d60a06dfdf039ac029 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sun, 24 Sep 2017 12:06:49 +0200
 Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
@@ -47,5 +47,5 @@ index 00000000..6e9c09c5
 +    </Loggers>
 +</Configuration>
 -- 
-2.19.1
+2.24.0
 

BungeeCord-Patches/0042-Add-console-command-completion.patch

@@ -1,4 +1,4 @@
-From bdd6e7c61c4ab74a994c759f7e2929ca8b76ddc5 Mon Sep 17 00:00:00 2001
+From 4549ec6bd14bd769d8320d016d5d34fe96c00a7e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
      }
  
 -- 
-2.20.1
+2.24.0
 

BungeeCord-Patches/0043-Providing-access-to-the-player-s-LoginResult-on-Logi.patch

@@ -1,4 +1,4 @@
-From 64b96dc7ccb8674d2a4859ef335135528c2dfdf4 Mon Sep 17 00:00:00 2001
+From ed7843b8eb9b37f64cbe73630dc52776572b9b80 Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@@ -65,5 +65,5 @@ index b76eae23..fecc597f 100644
  
      @Override
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0044-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From 2c0d98c9774251456c583e3581a4dc879bd60d6a Mon Sep 17 00:00:00 2001
+From ffda80e664efc2156d1474b1ec4abfb987572e91 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@@ -74,5 +74,5 @@ index fecc597f..3a9dab68 100644
                      bungee.getLogger().log( Level.INFO, "{0} has connected", this );
                  }
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0045-Forge-is-a-first-class-citizen.patch

@@ -1,11 +1,11 @@
-From 8508e32ef2fafc99b25534646a23294388b11771 Mon Sep 17 00:00:00 2001
+From f29bdb9f175e765243c4d771f1a80c950849f90c Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Mon, 28 May 2018 21:43:55 +0100
 Subject: [PATCH] Forge is a first class citizen
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index c527e3a9..8acdc22d 100644
+index c4f45964..6ae18f2c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -274,8 +274,6 @@ public class BungeeCord extends ProxyServer
@@ -31,5 +31,5 @@ index 2ec6c23c..5841cf63 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.21.0
+2.24.0
 

BungeeCord-Patches/0046-Ignore-empty-packets.patch

@@ -1,4 +1,4 @@
-From dc105ad9e7123923267007948e8323c5623ed7df Mon Sep 17 00:00:00 2001
+From 12fc5d0903a7673c88d9357fa9118c4ae9439dbe Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 12 Oct 2018 14:28:52 +0100
 Subject: [PATCH] Ignore empty packets
@@ -38,5 +38,5 @@ index e903fd09..25ee2027 100644
                      throw new CorruptedFrameException( "Empty Packet!" );
                  }
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0047-Don-t-use-a-bytebuf-for-packet-decoding.patch

@@ -1,4 +1,4 @@
-From c47d272e783d604efcca9ebd9dadc69f2eccf750 Mon Sep 17 00:00:00 2001
+From bcb2723d0375e32d8269ba0e726d0ff5392bfbee Mon Sep 17 00:00:00 2001
 From: creeper123123321 <creeper123123321@gmail.com>
 Date: Thu, 17 Jan 2019 03:25:59 +0000
 Subject: [PATCH] Don't use a bytebuf for packet decoding
@@ -67,5 +67,5 @@ index 25ee2027..743d65e4 100644
              }
          }
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0048-Provide-an-option-to-disable-entity-metadata-rewriti.patch

@@ -1,4 +1,4 @@
-From 6f3903e558fe6b5104c0afed79b1ea9e8b2dfb76 Mon Sep 17 00:00:00 2001
+From f7542c565dea3eb834520e2a29793e2a15e0cadd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting

BungeeCord-Patches/0049-Add-ProxyDefineCommandsEvent.patch

@@ -1,4 +1,4 @@
-From 94ced6ab8ca487304c30dfbed044e9510c436590 Mon Sep 17 00:00:00 2001
+From 85e6170d87e299a889b66413641e513d5398622e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 14 Mar 2019 07:44:06 +0000
 Subject: [PATCH] Add ProxyDefineCommandsEvent
@@ -105,5 +105,5 @@ index fba84905..1f8a2439 100644
                  LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
                          .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0050-Use-proper-max-length-for-serverbound-chat-packet.patch

@@ -1,4 +1,4 @@
-From 1cd07eb6820d14d1a1970d7c8c056d6ee1d39767 Mon Sep 17 00:00:00 2001
+From adbb5913dc06726b5264dd68c98018de31fe4b96 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:39:12 -0700
 Subject: [PATCH] Use proper max length for serverbound chat packet
@@ -72,5 +72,5 @@ index ffcd815c..0ded6739 100644
          if ( direction == ProtocolConstants.Direction.TO_CLIENT )
          {
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0051-Report-slow-events-in-milliseconds.patch

@@ -1,4 +1,4 @@
-From 38b999c122f1614d6dd763ef20f9feda9bcfddc0 Mon Sep 17 00:00:00 2001
+From 89fc27a7357e908a0ab107d90dd982a55d266a41 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 26 Mar 2019 04:28:18 +0000
 Subject: [PATCH] Report slow events in milliseconds
@@ -27,5 +27,5 @@ index 81bd18f0..9408e6c2 100644
          }
          return event;
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0052-Fix-upstream-javadocs.patch

@@ -1,4 +1,4 @@
-From 90298e0454419d72aa080e3c68cb268eac64a6b4 Mon Sep 17 00:00:00 2001
+From c432f07f93bb678c953a7e3dbbea03b330158152 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 30 Mar 2019 15:11:11 +0000
 Subject: [PATCH] Fix upstream javadocs
@@ -147,5 +147,5 @@ index 5d2b088c..be32ba89 100644
           * @return the underlying executor service or compatible wrapper
           */
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0053-OSX-native-zlib-and-crypto.patch

@@ -1,4 +1,4 @@
-From 9005b5db9f69d902e62b645acc47e9fd3d2fb2fd Mon Sep 17 00:00:00 2001
+From a21b245f42f32de0176c7a4db7fe38cfdd794c7b Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Tue, 16 Apr 2019 07:25:52 -0600
 Subject: [PATCH] OSX native zlib and crypto
@@ -329,5 +329,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0054-Speed-up-packet-construction.patch

@@ -1,4 +1,4 @@
-From 37fe29e359d3de76e83f85b9311a5ce01a79c1c7 Mon Sep 17 00:00:00 2001
+From a6d7ff3161071b244adb7657e6ba7c8ef657452b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 17 Apr 2019 09:24:38 +0300
 Subject: [PATCH] Speed up packet construction
@@ -343,5 +343,5 @@ index 87093807..c2b0e12c 100644
          final int getId(Class<? extends DefinedPacket> packet, int version)
          {
 -- 
-2.23.0
+2.24.0
 

BungeeCord-Patches/0055-Cache-session-exceptions.patch

@@ -1,4 +1,4 @@
-From 27c57c63c6994cd6f8985946b83540a8195ab37a Mon Sep 17 00:00:00 2001
+From bd5df76b8ece271ade0dbe455e9e88934100e97e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 25 Nov 2019 19:54:06 +0000
 Subject: [PATCH] Cache session exceptions