More more more work

patches/api-unmapped/0069-Add-PlayerJumpEvent.patch

@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Thu, 28 Sep 2017 17:21:32 -0400
-Subject: [PATCH] Add PlayerJumpEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..289a0d784a3c74caf8a7231b4dd166096b1849a1
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
-@@ -0,0 +1,106 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import com.google.common.base.Preconditions;
-+import org.bukkit.Location;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when the server detects the player is jumping.
-+ * <p>
-+ * Added to avoid the overhead and special case logic that many plugins use
-+ * when checking for jumps via PlayerMoveEvent, this event is fired whenever
-+ * the server detects that the player is jumping.
-+ */
-+public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancel = false;
-+    @NotNull private Location from;
-+    @NotNull private Location to;
-+
-+    public PlayerJumpEvent(@NotNull final Player player, @NotNull final Location from, @NotNull final Location to) {
-+        super(player);
-+        this.from = from;
-+        this.to = to;
-+    }
-+
-+    /**
-+     * Gets the cancellation state of this event. A cancelled event will not
-+     * be executed in the server, but will still pass to other plugins
-+     * <p>
-+     * If a jump event is cancelled, the player will be moved or
-+     * teleported back to the Location as defined by getFrom(). This will not
-+     * fire an event
-+     *
-+     * @return true if this event is cancelled
-+     */
-+    public boolean isCancelled() {
-+        return cancel;
-+    }
-+
-+    /**
-+     * Sets the cancellation state of this event. A cancelled event will not
-+     * be executed in the server, but will still pass to other plugins
-+     * <p>
-+     * If a jump event is cancelled, the player will be moved or
-+     * teleported back to the Location as defined by getFrom(). This will not
-+     * fire an event
-+     *
-+     * @param cancel true if you wish to cancel this event
-+     */
-+    public void setCancelled(boolean cancel) {
-+        this.cancel = cancel;
-+    }
-+
-+    /**
-+     * Gets the location this player jumped from
-+     *
-+     * @return Location the player jumped from
-+     */
-+    @NotNull
-+    public Location getFrom() {
-+        return from;
-+    }
-+
-+    /**
-+     * Sets the location to mark as where the player jumped from
-+     *
-+     * @param from New location to mark as the players previous location
-+     */
-+    public void setFrom(@NotNull Location from) {
-+        validateLocation(from);
-+        this.from = from;
-+    }
-+
-+    /**
-+     * Gets the location this player jumped to
-+     *
-+     * This information is based on what the client sends, it typically
-+     * has little relation to the arc of the jump at any given point.
-+     *
-+     * @return Location the player jumped to
-+     */
-+    @NotNull
-+    public Location getTo() {
-+        return to;
-+    }
-+
-+    private void validateLocation(Location loc) {
-+        Preconditions.checkArgument(loc != null, "Cannot use null location!");
-+        Preconditions.checkArgument(loc.getWorld() != null, "Cannot use location with null world!");
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/api-unmapped/0070-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Tue, 10 Oct 2017 18:44:42 +0200
-Subject: [PATCH] Expose client protocol version and virtual host
-
-Add a NetworkClient interface that provides access to:
-  - The socket address
-  - The protocol version
-  - The virtual host (the hostname/port the client used to connect
-    to the server)
-
-diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b851aa04f
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
-@@ -0,0 +1,41 @@
-+package com.destroystokyo.paper.network;
-+
-+import java.net.InetSocketAddress;
-+
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Represents a client connected to the server.
-+ */
-+public interface NetworkClient {
-+
-+    /**
-+     * Returns the socket address of the client.
-+     *
-+     * @return The client's socket address
-+     */
-+    @NotNull
-+    InetSocketAddress getAddress();
-+
-+    /**
-+     * Returns the protocol version of the client.
-+     *
-+     * @return The client's protocol version, or {@code -1} if unknown
-+     * @see <a href="http://wiki.vg/Protocol_version_numbers">List of protocol
-+     *     version numbers</a>
-+     */
-+    int getProtocolVersion();
-+
-+    /**
-+     * Returns the virtual host the client is connected to.
-+     *
-+     * <p>The virtual host refers to the hostname/port the client used to
-+     * connect to the server.</p>
-+     *
-+     * @return The client's virtual host, or {@code null} if unknown
-+     */
-+    @Nullable
-+    InetSocketAddress getVirtualHost();
-+
-+}
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9cf7adf244335ac7dccbdf11f605a8c6910f7414..04f1a6513711dde8576c9b5c2b04619c56b48d8a 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a player, connected or not
-  */
--public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified { // Paper
-+public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, com.destroystokyo.paper.network.NetworkClient { // Paper
- 
-     // Paper start
-     @Override