From 101b011009fe05bfcb9fbb8edcd2d30591358f0f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 2 Sep 2020 18:27:18 -0400 Subject: [PATCH] [Auto] 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: 0e90062a Remove draft API from entity persistence CraftBukkit Changes: 13fc33f73 #744: Add ability to get location from smithing inventory --- Spigot-API-Patches/0007-Entity-Origin-API.patch | 4 ++-- Spigot-API-Patches/0058-Entity-fromMobSpawner.patch | 4 ++-- Spigot-API-Patches/0117-Entity-getChunk-API.patch | 4 ++-- Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch | 4 ++-- Spigot-API-Patches/0214-Add-entity-liquid-API.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index f07f83e8f6..d4c9906b1c 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -5,10 +5,10 @@ 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 05a507fec7b5ba091608c39e2231ee64c085e790..d2fa3628a3825b2226292bf6974866557abf799e 100644 +index b46653655d1da3ffe54d91b038ec360cd77f0c44..573d959a0a534b72338566eea0a9eca4124dba92 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -599,4 +599,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -595,4 +595,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end diff --git a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch index 6632b4b8bb..cda4e99a26 100644 --- a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch @@ -5,10 +5,10 @@ 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 d2fa3628a3825b2226292bf6974866557abf799e..15e9ecd898b27d87a2d4f05c5b22de7c1b9a260c 100644 +index 573d959a0a534b72338566eea0a9eca4124dba92..aaedcb3039d746be0db230cbbf0570609e71a028 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -610,5 +610,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -606,5 +606,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Nullable Location getOrigin(); diff --git a/Spigot-API-Patches/0117-Entity-getChunk-API.patch b/Spigot-API-Patches/0117-Entity-getChunk-API.patch index 3b43f12f35..0f25689278 100644 --- a/Spigot-API-Patches/0117-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0117-Entity-getChunk-API.patch @@ -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 15e9ecd898b27d87a2d4f05c5b22de7c1b9a260c..d9922f0777d018f1e6c5673b9fc907fde3fbfa8d 100644 +index aaedcb3039d746be0db230cbbf0570609e71a028..8ab223674fe39e745bc6f24561ed71113182605b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; @@ -17,7 +17,7 @@ index 15e9ecd898b27d87a2d4f05c5b22de7c1b9a260c..d9922f0777d018f1e6c5673b9fc907fd import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -617,5 +618,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -613,5 +614,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); diff --git a/Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch index 4a56dab290..bb9b8e3941 100644 --- a/Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch @@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4a7b4112192f317b2feed9dfa7713155183578b6..d4c776f32caf0491670175a79584c73dd2c7fcca 100644 +index 06f41958b98d9f105a9735509b4eb50ebf0fbf60..df15c0f2e52abc51f35d6e00e17ffa0ea39d838b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -653,5 +653,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -649,5 +649,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull Chunk getChunk(); diff --git a/Spigot-API-Patches/0214-Add-entity-liquid-API.patch b/Spigot-API-Patches/0214-Add-entity-liquid-API.patch index c352c84578..38142e6a73 100644 --- a/Spigot-API-Patches/0214-Add-entity-liquid-API.patch +++ b/Spigot-API-Patches/0214-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d4c776f32caf0491670175a79584c73dd2c7fcca..7808ade92ccd3553056c57cdf77464fb8bdf9312 100644 +index df15c0f2e52abc51f35d6e00e17ffa0ea39d838b..cb9ef706eeb994f1948708ad5e8689550ea56df7 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -659,5 +659,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -655,5 +655,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); diff --git a/work/Bukkit b/work/Bukkit index b56e8160a9..0e90062a29 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit b56e8160a9514bb58a7348432255489e85dff8cf +Subproject commit 0e90062a2976d944b4c58187cbd8af95b9764b11 diff --git a/work/CraftBukkit b/work/CraftBukkit index 39806409e7..13fc33f732 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 39806409e71c5df7a22b55919923b05e5402b5d9 +Subproject commit 13fc33f73249ee2bd8edd5ac3657be65383bdf60