Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit)

Browse Source 
upcommit

Bukkit Changes:
dd18c0fc Deprecate and add note to regenerateChunk method
This commit is contained in:
Aikar 2018-08-06 23:19:31 -04:00
parent 72083fd891
commit a96460a635
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
View File

@ -1,4 +1,4 @@
From 99c0adf6c57cc58af99333310a1dfbed7383ae9b Mon Sep 17 00:00:00 2001
From 4179a14fc2e28427ea851b91888e8073831bcfc3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
index 43239f844..fe8d34685 100644
index 43239f84..fe8d3468 100644
--- a/src/main/java/org/bukkit/NamespacedKey.java
+++ b/src/main/java/org/bukkit/NamespacedKey.java
@@ -38,8 +38,8 @@ public final class NamespacedKey {
@ -21,10 +21,10 @@ index 43239f844..fe8d34685 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7875a71ad..e14098fac 100644
index d461c382..4e07af2e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1304,6 +1304,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1308,6 +1308,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -32,7 +32,7 @@ index 7875a71ad..e14098fac 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1319,6 +1320,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1323,6 +1324,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -40,7 +40,7 @@ index 7875a71ad..e14098fac 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1368,6 +1370,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1372,6 +1374,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -48,7 +48,7 @@ index 7875a71ad..e14098fac 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1387,6 +1390,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1391,6 +1394,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -56,7 +56,7 @@ index 7875a71ad..e14098fac 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1442,6 +1446,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1446,6 +1450,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -64,7 +64,7 @@ index 7875a71ad..e14098fac 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1463,6 +1468,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1467,6 +1472,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -73,7 +73,7 @@ index 7875a71ad..e14098fac 100644
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
index 107574546..6d5410eab 100644
index 10757454..6d5410ea 100644
--- a/src/main/java/org/bukkit/entity/AbstractHorse.java
+++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
@@ -22,7 +22,7 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
@ -86,7 +86,7 @@ index 107574546..6d5410eab 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
index 98af0563c..ec6890ae6 100644
index 98af0563..ec6890ae 100644
--- a/src/main/java/org/bukkit/entity/Guardian.java
+++ b/src/main/java/org/bukkit/entity/Guardian.java
@@ -12,7 +12,7 @@ public interface Guardian extends Monster {
@ -99,7 +99,7 @@ index 98af0563c..ec6890ae6 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
index cfce8fa57..8660070bb 100644
index cfce8fa5..8660070b 100644
--- a/src/main/java/org/bukkit/entity/Horse.java
+++ b/src/main/java/org/bukkit/entity/Horse.java
@@ -151,7 +151,7 @@ public interface Horse extends AbstractHorse {
@ -112,7 +112,7 @@ index cfce8fa57..8660070bb 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 98c6039b9..7c008237a 100644
index 98c6039b..7c008237 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -456,7 +456,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -205,7 +205,7 @@ index 98c6039b9..7c008237a 100644
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
index 2a02ab855..e33d00b30 100644
index 2a02ab85..e33d00b3 100644
--- a/src/main/java/org/bukkit/entity/Skeleton.java
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
@@ -15,6 +15,7 @@ public interface Skeleton extends Monster {
@ -217,7 +217,7 @@ index 2a02ab855..e33d00b30 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
index cf53ea22f..629233796 100644
index cf53ea22..62923379 100644
--- a/src/main/java/org/bukkit/entity/Zombie.java
+++ b/src/main/java/org/bukkit/entity/Zombie.java
@@ -29,14 +29,14 @@ public interface Zombie extends Monster {
@ -238,7 +238,7 @@ index cf53ea22f..629233796 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index de4fb37f3..f1de2af6e 100644
index de4fb37f..f1de2af6 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -24,6 +24,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@ -258,7 +258,7 @@ index de4fb37f3..f1de2af6e 100644
public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
this(player, hostname, address, realAddress); // Spigot
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
index c8e68570f..45431b360 100644
index c8e68570..45431b36 100644
--- a/src/main/java/org/bukkit/inventory/Merchant.java
+++ b/src/main/java/org/bukkit/inventory/Merchant.java
@@ -32,7 +32,7 @@ public interface Merchant {
@ -280,7 +280,7 @@ index c8e68570f..45431b360 100644
void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException;
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
index 1413b361b..b4a8051cc 100644
index 1413b361..b4a8051c 100644
--- a/src/main/java/org/bukkit/potion/Potion.java
+++ b/src/main/java/org/bukkit/potion/Potion.java
@@ -78,6 +78,7 @@ public class Potion {
@ -292,7 +292,7 @@ index 1413b361b..b4a8051cc 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
index 40f8d12b9..33d192287 100644
index 40f8d12b..33d19228 100644
--- a/src/main/java/org/bukkit/potion/PotionBrewer.java
+++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
@@ -34,6 +34,8 @@ public interface PotionBrewer {
@ -305,7 +305,7 @@ index 40f8d12b9..33d192287 100644
*/
public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended);
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
index 034421a76..f1a54c23c 100644
index 034421a7..f1a54c23 100644
--- a/src/main/java/org/bukkit/potion/PotionType.java
+++ b/src/main/java/org/bukkit/potion/PotionType.java
@@ -68,6 +68,7 @@ public enum PotionType {
@ -335,7 +335,7 @@ index 034421a76..f1a54c23c 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
index ab71f3c31..358ea386b 100644
index ab71f3c3..358ea386 100644
--- a/src/main/java/org/bukkit/scoreboard/Team.java
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
@@ -84,7 +84,7 @@ public interface Team {

6
Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
View File

@ -1,4 +1,4 @@
From abf7402bc4ecece3ae26cdc95077e1948f349189 Mon Sep 17 00:00:00 2001
From 7991f82af6e972ee2ff68cb2c3d777f5226999e8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's
@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e14098fa..ac32195d 100644
index 4e07af2e..49d2cc45 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2,11 +2,14 @@ package org.bukkit;
@ -24,7 +24,7 @@ index e14098fa..ac32195d 100644
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
@@ -431,6 +434,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -435,6 +438,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getEntitiesByClasses(Class<?>... classes);

6
Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -1,4 +1,4 @@
From 8c9cae0f00a34d7db7987f0de3e348143fca2559 Mon Sep 17 00:00:00 2001
From 58d01b2ff0aba651fd07c05986a36772ed13b46f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 29 Aug 2017 23:58:48 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -410,10 +410,10 @@ index 4d0acaf5..0ae85d85 100644
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ac32195d..d2b3e192 100644
index 49d2cc45..fd3a63fa 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1672,7 +1672,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1676,7 +1676,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()}
* @param <T> Type
*/

6
Spigot-API-Patches/0113-Expand-Explosions-API.patch
View File

@ -1,4 +1,4 @@
From 43407287b576901c8c0706ff95904f8399a80d5f Mon Sep 17 00:00:00 2001
From c38195222988bd5699993de420938b81bda0b0c2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:24:42 -0500
Subject: [PATCH] Expand Explosions API
@ -95,10 +95,10 @@ index c1689168..d0d86e1a 100644
@Override
public boolean equals(Object obj) {
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d2b3e192..7a6728fb 100644
index fd3a63fa..81d9e1df 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -853,6 +853,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -857,6 +857,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(Location loc, float power, boolean setFire);

6
Spigot-API-Patches/0118-Add-World.getEntity-UUID-API.patch
View File

@ -1,14 +1,14 @@
From afba86e7d21df889c5255fc1fdd9404bed8f9202 Mon Sep 17 00:00:00 2001
From 45d25ea6abacf44eee688b4e2bb8140be49fd359 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:07:16 +0200
Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7a6728fb..550c26be 100644
index 81d9e1df..6e583b42 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -653,6 +653,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -657,6 +657,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);

2
work/Bukkit

@ -1 +1 @@
Subproject commit 97d31e64a5e4206b4c191f1d313d7c5fc5db88e4
Subproject commit dd18c0fcfbbb0d7ea34d9bd0bf0366041f49bd0b