Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
9d0221aa API to get client side view distance.
9be7f0ea SPIGOT-4395: Additions to PlayerBedEnterEvent.
01e534c6 Minor cosmetic cleanups to imports etc

CraftBukkit Changes:
96c461b3 API to get client side view distance.
e2785f4e Remove note about development build
a8000588 SPIGOT-4395: Additions to PlayerBedEnterEvent.

Spigot Changes:
117d4f7e Rebuild patches
This commit is contained in:
Shane Freeder
2018-11-03 00:23:27 +00:00
parent 6c2709118f
commit 1e39773b53
68 changed files with 465 additions and 470 deletions

View File

@@ -1,14 +1,14 @@
From 37fc69d96efb51fcf33bdd3bc8923e0d60ccb36a Mon Sep 17 00:00:00 2001
From 292b6bb1583fa684c7438958fcc58b3aa0f95117 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Sep 2017 17:21:44 -0400
Subject: [PATCH] Add PlayerJumpEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 504c9ad473..4ac310bae1 100644
index 9614348157..b357cb2077 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1476,6 +1476,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1481,6 +1481,7 @@ public abstract class EntityHuman extends EntityLiving {
return 0;
}
@@ -17,7 +17,7 @@ index 504c9ad473..4ac310bae1 100644
super.cH();
this.a(StatisticList.JUMP);
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f34613fb25..c12487b024 100644
index 3289ba3ffd..b54da4eb79 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -59,6 +59,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -66,5 +66,5 @@ index f34613fb25..c12487b024 100644
this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
--
2.19.0
2.19.1