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:
aba2aaaf Correct pom.xml version

CraftBukkit Changes:
e8b39d43 SPIGOT-5103: World.save does not save gamerules
3164e531 Correct pom.xml version

Spigot Changes:
595711b0 Correct pom.xml version
This commit is contained in:
Shane Freeder
2019-06-25 14:55:44 +01:00
parent 269e1e95d9
commit 304244232f
40 changed files with 144 additions and 143 deletions

View File

@@ -1,4 +1,4 @@
From 58ba763c5947745c305f8c75eb447fd464f04162 Mon Sep 17 00:00:00 2001
From 948edd8a1cb0f5e2518a52386f557246e1ab7fb8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -114,10 +114,10 @@ index a167843bfb..9e5cd22d7d 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4ebc9b50fb..af947df472 100644
index 4e17f74ff0..c55a2a213f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -979,7 +979,7 @@ public class WorldServer extends World {
@@ -989,7 +989,7 @@ public class WorldServer extends World {
{
if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
{
@@ -126,7 +126,7 @@ index 4ebc9b50fb..af947df472 100644
}
}
}
@@ -1002,7 +1002,7 @@ public class WorldServer extends World {
@@ -1012,7 +1012,7 @@ public class WorldServer extends World {
{
if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
{