Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-API-Patches/0006-Entity-Origin-API.patch
View File

@@ -1,14 +1,14 @@
From 9318c7b2806647ec99349588486dd9f4dab0f763 Mon Sep 17 00:00:00 2001
From afc54113a05902a020f9d36d62e7de74fce3f3b2 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index e7d0ceb44..ce22ded94 100644
index 0263e9cc..a2714118 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -545,4 +545,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -546,4 +546,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot end
@@ -25,7 +25,7 @@ index e7d0ceb44..ce22ded94 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
index 0cd830d90..170a9aee5 100644
index 0cd830d9..170a9aee 100644
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
@@ -51,4 +51,15 @@ public interface FallingBlock extends Entity {
@@ -45,7 +45,7 @@ index 0cd830d90..170a9aee5 100644
+ }
}
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
index fcd0a9b2f..2abef57c9 100644
index fcd0a9b2..2abef57c 100644
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
@@ -35,4 +35,15 @@ public interface TNTPrimed extends Explosive {
@@ -65,5 +65,5 @@ index fcd0a9b2f..2abef57c9 100644
+ }
}
--
2.18.0
2.19.0

8
Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
View File

@@ -1,14 +1,14 @@
From 5738a5cbdbddb664a0392738369b750d28712ad7 Mon Sep 17 00:00:00 2001
From 573401ed73ea3117352b8c823b91e807052363c3 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ce22ded94..64f72ff83 100644
index a2714118..6bdbd7ab 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -555,5 +555,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -556,5 +556,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return Location where entity originates or null if not yet added
*/
Location getOrigin();
@@ -22,5 +22,5 @@ index ce22ded94..64f72ff83 100644
// Paper end
}
--
2.18.0
2.19.0

8
Spigot-API-Patches/0119-Entity-getChunk-API.patch
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