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:
c23d391f Update documentation of BlockPhysicsEvent
14fcd896 SPIGOT-4258: Add Player.updateCommands method

CraftBukkit Changes:
15da7067 SPIGOT-4258: Add Player.updateCommands method

Spigot Changes:
2b0e71c7 Rebuild patches
This commit is contained in:
Aikar
2018-08-12 02:08:09 -04:00
parent 8ad4c1e475
commit 4bb44d2fcb
15 changed files with 95 additions and 93 deletions

View File

@@ -1,4 +1,4 @@
From 5e793577fb3aed02f7c52c6456b482e7942d7b5b Mon Sep 17 00:00:00 2001
From 32f08be9fa7cde20a13a4f2a8221a5ee11dfbfef Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
@@ -79,7 +79,7 @@ index 38d169cc14..d0516b0885 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3dc76f7dd6..fa35a75f3a 100644
index 563e90d4dc..cfea81bf78 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1628,7 +1628,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -100,8 +100,8 @@ index 3dc76f7dd6..fa35a75f3a 100644
}
+ // Paper end
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
@Override
public void updateCommands() {
--
2.18.0