Updated Upstream (Bukkit/CraftBukkit)

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:
867794b2 Make setPersistent also control player saving

CraftBukkit Changes:
02518f92 Make setPersistent also control player saving
This commit is contained in:
Shane Freeder 2018-10-03 20:19:35 +01:00
parent 26153def87
commit 2dcae290df
14 changed files with 104 additions and 104 deletions

View file

@ -1,4 +1,4 @@
From b1a6336cdd49f20687339e79f653f81c43953848 Mon Sep 17 00:00:00 2001
From 2cb5b1bda018ce49ec34c527b63a8848990a01ea Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:25:48 -0400
Subject: [PATCH] Entity#getChunk API
@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 64f72ff83..72ebe35fb 100644
index 6bdbd7ab..66904a0c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1,5 +1,6 @@
@ -16,7 +16,7 @@ index 64f72ff83..72ebe35fb 100644
import org.bukkit.Location;
import org.bukkit.EntityEffect;
import org.bukkit.Nameable;
@@ -562,5 +563,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -563,5 +564,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();
@ -30,5 +30,5 @@ index 64f72ff83..72ebe35fb 100644
// Paper end
}
--
2.18.0
2.19.0