SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Update upstream B/CB/S

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zach Brown 2018-10-27 00:02:22 -04:00
Ursprung b1ab9ad452
Commit c4865a6445
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: CC9DA35FC5450B76
57 geänderte Dateien mit 380 neuen und 386 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
Spigot-API-Patches/0006-Entity-Origin-API.patch
Datei anzeigen

@ -1,14 +1,14 @@
From afc54113a05902a020f9d36d62e7de74fce3f3b2 Mon Sep 17 00:00:00 2001
From b6b21b6bdacb1ea6abdd132e3f173822ef543836 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 0263e9cc..a2714118 100644
index 4f5eb367..d793de62 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -546,4 +546,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -557,4 +557,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot end
@ -65,5 +65,5 @@ index fcd0a9b2..2abef57c 100644
+ }
}
--
2.19.0
2.19.1

8
Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 02510a57a8684efe916a9af81a503ffb5d67cf69 Mon Sep 17 00:00:00 2001
From 94390b309f18a31512191e9599c08a2cdf746191 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:47:27 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 6a5de671d..b4f519c68 100644
index ed1d5064..ed6463c6 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -383,4 +383,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -454,4 +454,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @return collision status
*/
boolean isCollidable();
@ -29,5 +29,5 @@ index 6a5de671d..b4f519c68 100644
+ // Paper end
}
--
2.18.0
2.19.1

8
Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9e7f9915a3c7e0c57d407ff884ef4262aea8568b Mon Sep 17 00:00:00 2001
From 5a4ad7c25a554997a5d590629a529cd35f099366 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:23:03 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 91ad39a8..7875a71a 100644
index 94647047..06bcee03 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -25,6 +25,33 @@ import org.bukkit.util.Vector;
@@ -28,6 +28,33 @@ import org.bukkit.util.Vector;
*/
public interface World extends PluginMessageRecipient, Metadatable {
@ -45,5 +45,5 @@ index 91ad39a8..7875a71a 100644
* Gets the {@link Block} at the given coordinates
*
--
2.18.0
2.19.1

50
Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From ed11ef22d0208c77b50c740e7fd69c217d3688ba 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 7ac07ac07ac0..7ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 06bcee03..849ad2cb 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1350,6 +1350,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1567,6 +1567,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 7ac07ac07ac0..7ac07ac07ac0 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1365,6 +1366,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1582,6 +1583,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 7ac07ac07ac0..7ac07ac07ac0 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1414,6 +1416,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1631,6 +1633,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 7ac07ac07ac0..7ac07ac07ac0 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1433,6 +1436,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1650,6 +1653,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 7ac07ac07ac0..7ac07ac07ac0 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1488,6 +1492,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1705,6 +1709,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 7ac07ac07ac0..7ac07ac07ac0 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1509,6 +1514,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1726,6 +1731,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()}
@ -72,7 +72,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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);
@@ -1531,6 +1537,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1748,6 +1754,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
@ -80,7 +80,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
@@ -1555,6 +1562,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1772,6 +1779,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
@ -89,7 +89,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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, boolean force);
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
index 7ac07ac07ac0..7ac07ac07ac0 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
@ -102,7 +102,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 9a569d3a..8c5efd17 100644
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
@@ -138,6 +138,7 @@ public interface AreaEffectCloud extends Entity {
@ -114,7 +114,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<T> void setParticle(Particle particle, T data);
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
index 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -127,7 +127,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
index 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -140,7 +140,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 99353714..e848ab5b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -446,7 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -233,7 +233,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -245,7 +245,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
index 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -266,7 +266,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -286,7 +286,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 762c43d6..ec2b8b8e 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -126,10 +126,10 @@ public interface ItemFactory {
@ -304,7 +304,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
index 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -326,7 +326,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -338,7 +338,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
index 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -351,7 +351,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 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 {
@ -381,7 +381,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
index 7ac07ac07ac0..7ac07ac07ac0 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 {

8
Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 573401ed73ea3117352b8c823b91e807052363c3 Mon Sep 17 00:00:00 2001
From 863ed563e69f6e02d31354d301825cfc27f89b58 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 a2714118..6bdbd7ab 100644
index d793de62..08399637 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -556,5 +556,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -567,5 +567,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 a2714118..6bdbd7ab 100644
// Paper end
}
--
2.19.0
2.19.1

14
Spigot-API-Patches/0064-LivingEntity-setKiller.patch
Datei anzeigen

@ -1,23 +1,23 @@
From bed7ac830a6ec1ab5b4b4e19a6c4abe47a2ba813 Mon Sep 17 00:00:00 2001
From 9c0208e3612a2a5a623ace987c4e420f500e2bd1 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:49:43 -0500
Subject: [PATCH] LivingEntity#setKiller
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index f6ae0a6d..700ed29f 100644
index ed6463c6..7770da71 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -14,6 +14,8 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.projectiles.ProjectileSource;
@@ -18,6 +18,8 @@ import org.bukkit.projectiles.ProjectileSource;
import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;
+import javax.annotation.Nullable;
+
/**
* Represents a living entity, such as a monster or player
*/
@@ -169,6 +171,15 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -240,6 +242,15 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/
public Player getKiller();
@ -34,5 +34,5 @@ index f6ae0a6d..700ed29f 100644
* Adds the given {@link PotionEffect} to the living entity.
* <p>
--
2.18.0
2.19.1

8
Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9833fee48ce1a110ee78003439deafc84f689c55 Mon Sep 17 00:00:00 2001
From fcc3fbaed0fd4baeab9f53a7c9ac847cddfb0a0f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Nov 2017 21:10:01 -0500
Subject: [PATCH] API to get a BlockState without a snapshot
@ -9,10 +9,10 @@ on the real tile entity.
This is useful for where performance is needed
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 679c29cf..238de6f0 100644
index 24100a6a..d71815d1 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -223,6 +223,15 @@ public interface Block extends Metadatable {
@@ -226,6 +226,15 @@ public interface Block extends Metadatable {
*/
BlockState getState();
@ -29,5 +29,5 @@ index 679c29cf..238de6f0 100644
* Returns the biome that this block resides in
*
--
2.18.0
2.19.1

10
Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 55e3e61db93e7dba8a19a6f2094fccf3b2fcab2f Mon Sep 17 00:00:00 2001
From 5dbcfd053603e67423074aaa91dd327e6dca7a60 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:29:28 -0500
Subject: [PATCH] Add setPlayerProfile API for Skulls
@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
which commonly cause rate limit issues with Mojang API
diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
index 92363d33..b83df2f7 100644
index 499a153e..3c75341e 100644
--- a/src/main/java/org/bukkit/block/Skull.java
+++ b/src/main/java/org/bukkit/block/Skull.java
@@ -4,6 +4,8 @@ import org.bukkit.Material;
@ -38,8 +38,8 @@ index 92363d33..b83df2f7 100644
+ // Paper end
+
/**
* Gets the rotation of the skull in the world
*
* Gets the rotation of the skull in the world (or facing direction if this
* is a wall mounted skull).
diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
index 15c1dfd9..a458000f 100644
--- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
@ -77,5 +77,5 @@ index 15c1dfd9..a458000f 100644
* Gets the owner of the skull.
*
--
2.16.1.windows.1
2.19.1

16
Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 3503f246b1f30c2609671fdc92b80b62e981d7db Mon Sep 17 00:00:00 2001
From 0ccef7fd8a50d98175e9cac5f171ee4d12d037f3 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,10 +6,10 @@ 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 bf6f91917..9ce6d7d57 100644
index 849ad2cb..99fbf327 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2,11 +2,14 @@ package org.bukkit;
@@ -2,6 +2,8 @@ package org.bukkit;
import java.io.File;
import org.bukkit.generator.ChunkGenerator;
@ -18,13 +18,7 @@ index bf6f91917..9ce6d7d57 100644
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.function.Predicate;
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
@@ -444,6 +447,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -447,6 +449,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
@ -264,5 +258,5 @@ index bf6f91917..9ce6d7d57 100644
* Get a list of all players in this World
*
--
2.19.0
2.19.1

12
Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ce6f1473f564bc740f9438a4c45876bdff15d691 Mon Sep 17 00:00:00 2001
From 43beb0d7397bc0067f08e4ec41ddfb4d46145f7d 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
@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
new file mode 100644
index 000000000..50b52d6bf
index 00000000..50b52d6b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +1,416 @@
@ -431,7 +431,7 @@ index 000000000..50b52d6bf
+ }
+}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
index 4d0acaf5b..827aa00c8 100644
index 4d0acaf5..827aa00c 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
@@ -82,6 +82,16 @@ public enum Particle {
@ -452,10 +452,10 @@ index 4d0acaf5b..827aa00c8 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 9ce6d7d57..d20b940ac 100644
index 99fbf327..1f63eba8 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1751,7 +1751,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1967,7 +1967,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()}
* @param <T> Type
*/
@ -515,5 +515,5 @@ index 9ce6d7d57..d20b940ac 100644
/**
* Spawns the particle (the number of times specified by count)
--
2.19.0
2.19.1

8
Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 30af6dcd81dc8b15be9306fe0bc16f3fe39203f7 Mon Sep 17 00:00:00 2001
From bffcdf28d7682a5c6c9094d680b691a7d8d71656 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 16 Jun 2018 01:17:39 -0500
Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index d699a8e18..dfb3f484f 100644
index 7770da71..3191aeca 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -408,5 +408,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -479,5 +479,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @param arrows Number of arrows to stick in this entity
*/
void setArrowsStuck(int arrows);
@ -29,5 +29,5 @@ index d699a8e18..dfb3f484f 100644
// Paper end
}
--
2.18.0
2.19.1

10
Spigot-API-Patches/0112-Expand-Explosions-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ef5875eebd65341d8a1651738ca82c417bf6a3eb Mon Sep 17 00:00:00 2001
From 73be070d77dd79f210bf045c6ec01bf2ecf72f18 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
@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 162a76e8b..056a4d6bb 100644
index 162a76e8..056a4d6b 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -745,6 +745,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
@ -98,10 +98,10 @@ index 162a76e8b..056a4d6bb 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 d20b940ac..673f1a3eb 100644
index 1f63eba8..e83b2ac7 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -899,6 +899,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1115,6 +1115,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(Location loc, float power, boolean setFire);
@ -205,5 +205,5 @@ index d20b940ac..673f1a3eb 100644
* Gets the {@link Environment} type of this world
*
--
2.19.0
2.19.1

10
Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 8ec6c2fa48cbf638a5d27edb47d12c1442d24992 Mon Sep 17 00:00:00 2001
From fcf363977c7c1a57154fbfe638aa85f6480329ba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jun 2018 00:19:19 -0400
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index dfb3f484f..ac5bd8a57 100644
index 3191aeca..f4f60de2 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -10,6 +10,7 @@ import org.bukkit.Material;
@@ -12,6 +12,7 @@ import org.bukkit.World;
import org.bukkit.attribute.Attributable;
import org.bukkit.block.Block;
import org.bukkit.inventory.EntityEquipment;
@ -17,7 +17,7 @@ index dfb3f484f..ac5bd8a57 100644
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.projectiles.ProjectileSource;
@@ -422,5 +423,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -493,5 +494,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @param delay Delay in ticks
*/
void setShieldBlockingDelay(int delay);
@ -50,5 +50,5 @@ index dfb3f484f..ac5bd8a57 100644
// Paper end
}
--
2.18.0
2.19.1

12
Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 9068935d9c8fc8d37ca47ceeef6e752c5ef84ecf Mon Sep 17 00:00:00 2001
From 596f70a064c3481f5197b4b17cd4126e9dd8799a 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 673f1a3eb..51cf0bfe8 100644
index e83b2ac7..7c700cc2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -699,6 +699,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -705,6 +705,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
@ -23,8 +23,8 @@ index 673f1a3eb..51cf0bfe8 100644
+ // Paper end
+
/**
* Gets the unique name of this world
*
* Returns a list of entities within a bounding box centered around a
* Location.
--
2.19.0
2.19.1

8
Spigot-API-Patches/0119-Entity-getChunk-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 2cb5b1bda018ce49ec34c527b63a8848990a01ea Mon Sep 17 00:00:00 2001
From aa7fb497e60582cd247d5e3a6b36816f1b2e4a87 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 6bdbd7ab..66904a0c 100644
index 08399637..f94160bf 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 6bdbd7ab..66904a0c 100644
import org.bukkit.Location;
import org.bukkit.EntityEffect;
import org.bukkit.Nameable;
@@ -563,5 +564,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -574,5 +575,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();
@ -30,5 +30,5 @@ index 6bdbd7ab..66904a0c 100644
// Paper end
}
--
2.19.0
2.19.1

10
Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9ec35d157059d4ecbd252758b13ffd7954976cbd Mon Sep 17 00:00:00 2001
From e1702becffffcfef95443310f01d1b93dcd5e38f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 4 Aug 2018 19:37:35 -0400
Subject: [PATCH] Provide Chunk Coordinates as a Long API
@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
to look up by the long key too.
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
index 079b9febe..b347a3ccf 100644
index 079b9feb..b347a3cc 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -23,6 +23,32 @@ public interface Chunk {
@ -44,10 +44,10 @@ index 079b9febe..b347a3ccf 100644
* Gets the world containing this chunk
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 5e6cb56ab..e451ca611 100644
index 7c700cc2..00d72565 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -137,6 +137,21 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -139,6 +139,21 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Chunk getChunkAt(Block block);
@ -70,5 +70,5 @@ index 5e6cb56ab..e451ca611 100644
* Checks if the specified {@link Chunk} is loaded
*
--
2.19.0
2.19.1

10
Spigot-API-Patches/0135-Async-Chunks-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From bad3fe871eeaf7fe3ce39307f84193c264c833cb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:43:33 -0600
Subject: [PATCH] Async Chunks API
@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 00d72565..8e322cab 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -150,6 +150,352 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -152,6 +152,352 @@ public interface World extends PluginMessageRecipient, Metadatable {
public default Chunk getChunkAt(long chunkKey) {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -365,10 +365,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index f94160bf..5ee57656 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -124,6 +124,28 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -135,6 +135,28 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
*/
public boolean teleport(Entity destination, TeleportCause cause);

12
Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From f909641ae51041c6ecd8af3fa5136461e8e8e7bf Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 14 Aug 2018 21:42:10 -0700
Subject: [PATCH] Allow Blocks to be accessed via a long key
@ -18,7 +18,7 @@ Y range: [0, 1023]
X, Z range: [-67 108 864, 67 108 863]
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 8dcb15fb..7e1ee875 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -10,7 +10,6 @@ import org.bukkit.util.Vector;
@ -49,10 +49,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
* @return A new location where X/Y/Z are the center of the block
*/
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 8e322cab..adace47c 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -73,6 +73,37 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -75,6 +75,37 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Block getBlockAt(Location location);
@ -91,10 +91,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
* Gets the y coordinate of the lowest block at this position such that the
* block and all blocks above it are transparent for lighting purposes.
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d71815d1..e529e204 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -139,6 +139,33 @@ public interface Block extends Metadatable {
@@ -142,6 +142,33 @@ public interface Block extends Metadatable {
*/
int getZ();

10
Spigot-API-Patches/0141-isChunkGenerated-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From fbbca41aee75b1949e0b4133ad2a87923d28328e Mon Sep 17 00:00:00 2001
From f36153fbc7b8b55a0bb0529803d9e1fc60c14f36 Mon Sep 17 00:00:00 2001
From: cswhite2000 <18whitechristop@gmail.com>
Date: Tue, 21 Aug 2018 19:39:46 -0700
Subject: [PATCH] isChunkGenerated API
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 7e1ee875e..9457832bc 100644
index 7e1ee875..9457832b 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions;
@ -33,10 +33,10 @@ index 7e1ee875e..9457832bc 100644
/**
* Sets the position of this Location and returns itself
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index c918c26be..d367e890f 100644
index adace47c..de89122e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -182,6 +182,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -184,6 +184,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -55,5 +55,5 @@ index c918c26be..d367e890f 100644
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
* as well as future support
--
2.19.0
2.19.1

10
Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From f63d962bbe2d56e72384b92df8819041d1e57d54 Mon Sep 17 00:00:00 2001
From 14a1db13c30927e0e9b1b1b9540aab8f749b1df7 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Wed, 29 Aug 2018 00:37:30 -0400
Subject: [PATCH] Add Force-Loaded Chunk API
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
index 8a8043351..4b9e0ca46 100644
index 8a804335..4b9e0ca4 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -168,4 +168,20 @@ public interface Chunk {
@ -30,10 +30,10 @@ index 8a8043351..4b9e0ca46 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d367e890f..7bfe0b684 100644
index de89122e..aa28c452 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -193,6 +193,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -195,6 +195,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
}
@ -51,5 +51,5 @@ index d367e890f..7bfe0b684 100644
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
* as well as future support
--
2.19.0
2.19.1

8
Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ced5f29550020b78316bb1e18dfa359bd080a9c4 Mon Sep 17 00:00:00 2001
From b5c238367804b804eed5fd262a61d3b9eaf8128d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 3 Sep 2018 18:13:53 -0500
Subject: [PATCH] Add ray tracing methods to LivingEntity
@ -61,10 +61,10 @@ index 00000000..fe43d955
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index ac5bd8a5..62e45eda 100644
index f4f60de2..c3c31f50 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -71,6 +71,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -79,6 +79,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/
public Block getTargetBlock(Set<Material> transparent, int maxDistance);
@ -143,5 +143,5 @@ index ac5bd8a5..62e45eda 100644
* Gets the last two blocks along the living entity's line of sight.
* <p>
--
2.19.0
2.19.1

8
Spigot-API-Patches/0160-Add-LivingEntity-getTargetEntity.patch
Datei anzeigen

@ -1,4 +1,4 @@
From cd531bb730c2417a5715286b82d97394382314d8 Mon Sep 17 00:00:00 2001
From ae10d61250d9ca7880f64c2a8923ea699696102d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Sep 2018 00:32:53 -0500
Subject: [PATCH] Add LivingEntity#getTargetEntity
@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
new file mode 100644
index 000000000..5df8eed23
index 00000000..5df8eed2
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
@@ -0,0 +1,35 @@
@ -46,10 +46,10 @@ index 000000000..5df8eed23
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 62e45eda2..a556586eb 100644
index c3c31f50..263a94a7 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -140,6 +140,50 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -148,6 +148,50 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/
@Nullable
public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);

8
Spigot-API-Patches/0161-Add-sun-related-API.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 09dee3bad3aecdc375e9059a0679536b3dc2a23b Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:15 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index aa28c452..27e58136 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1207,6 +1207,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1423,6 +1423,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public void setFullTime(long time);
@ -26,7 +26,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
* Returns whether the world has an ongoing storm.
*
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 48eddcd3..1b108a4a 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -13,6 +13,13 @@ public interface Mob extends LivingEntity, Lootable {

12
Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 02e9001365c48007078e30a3e7566cecc2a53414 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:10:36 -0400
Subject: [PATCH] Store reference to current Chunk for Entity and Block
@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
of having to look it up by hashmap lookups.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 4870a4bb5..085d3d3e8 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -32,7 +32,7 @@ public class Chunk implements IChunkAccess {
@ -94,7 +94,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
// Do not pass along players, as doing so can get them stuck outside of time.
// (which for example disables inventory icon updates and prevents block breaking)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 3e5c2d8e7..fde9d4d51 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -147,7 +147,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
private String entityKeyString;
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 7390061bf..c69209497 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -167,7 +167,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 2c57a4f03..153efb9b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -9,6 +9,7 @@ import java.util.UUID;
@ -178,7 +178,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -42,6 +43,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -43,6 +44,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity;
}

18
Spigot-Server-Patches/0023-Entity-Origin-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 0569c054bc082c7132d80e304ec79a176ce9de5c Mon Sep 17 00:00:00 2001
From 1deac4fb35880f7543e83f0bcf642d40608f9137 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 06b7182a45..45ea6b138e 100644
index 792240f2e..65ba3fe66 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -162,6 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -51,7 +51,7 @@ index 06b7182a45..45ea6b138e 100644
NBTTagList nbttaglist = new NBTTagList();
double[] adouble1 = adouble;
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 25960cff2a..1fb912eb0d 100644
index 25960cff2..1fb912eb0 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -249,6 +249,14 @@ public class EntityFallingBlock extends Entity {
@ -70,7 +70,7 @@ index 25960cff2a..1fb912eb0d 100644
public void a(boolean flag) {
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 5ceb3f2068..87f3205f82 100644
index 5ceb3f206..87f3205f8 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
@ -89,7 +89,7 @@ index 5ceb3f2068..87f3205f82 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
index 769d599c59..e37da10e09 100644
index 769d599c5..e37da10e0 100644
--- a/src/main/java/net/minecraft/server/NBTTagList.java
+++ b/src/main/java/net/minecraft/server/NBTTagList.java
@@ -174,6 +174,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@ -101,7 +101,7 @@ index 769d599c59..e37da10e09 100644
if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase)this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5dfa0fdec3..e4c1010748 100644
index 739e19bb1..21c9bb325 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -968,6 +968,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -118,10 +118,10 @@ index 5dfa0fdec3..e4c1010748 100644
flag = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7a204e8edf..0c9b7276fc 100644
index 153efb9b9..df7c77e9a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -795,4 +795,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -802,4 +802,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end
@ -135,5 +135,5 @@ index 7a204e8edf..0c9b7276fc 100644
+ // Paper end
}
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 62e5eaac06b42adfec37d77a1e29dabfc855d7f3 Mon Sep 17 00:00:00 2001
From a0fddd38b399a7b288f85bc375efd45262aa71fb Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index cc9e48d585..dff0dd2e9a 100644
index 3a15b47dd..5f14fb850 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -98,7 +98,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -100,7 +100,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setHealth(double health) {
health = (float) health;
if ((health < 0) || (health > getMaxHealth())) {
@ -21,5 +21,5 @@ index cc9e48d585..dff0dd2e9a 100644
getHandle().setHealth((float) health);
--
2.19.0
2.19.1

12
Spigot-Server-Patches/0054-Add-velocity-warnings.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 901aeed4b57279cd6901464e6643049fc57e2a5f Mon Sep 17 00:00:00 2001
From 719aa0238fa7690c81459375e9253d12203ad93a Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 267224c69c..17fdc58bd0 100644
index 14f7eca76..b09ed441c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -196,6 +196,7 @@ public final class CraftServer implements Server {
@ -17,10 +17,10 @@ index 267224c69c..17fdc58bd0 100644
private final class BooleanWrapper {
private boolean value = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0c9b7276fc..ae705e86f9 100644
index df7c77e9a..2858f11ee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -264,12 +264,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -265,12 +265,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public void setVelocity(Vector velocity) {
Preconditions.checkArgument(velocity != null, "velocity");
velocity.checkFinite();
@ -66,7 +66,7 @@ index 0c9b7276fc..ae705e86f9 100644
public double getHeight() {
return getHandle().length;
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 91b8aa6a16..0c106ea9c5 100644
index 91b8aa6a1..0c106ea9c 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
@ -91,5 +91,5 @@ index 91b8aa6a16..0c106ea9c5 100644
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 539dda3f9de6eb64b362b456ecc96d83ee05ee89 Mon Sep 17 00:00:00 2001
From 3fd318b20b1379f453d1befc6cec20ba093dfcda Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:43:39 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index dff0dd2e9a..09cf843d46 100644
index 5f14fb850..716eda990 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -512,4 +512,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -537,4 +537,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public boolean isCollidable() {
return getHandle().collides;
}
@ -26,5 +26,5 @@ index dff0dd2e9a..09cf843d46 100644
+ // Paper end
}
--
2.19.0
2.19.1

14
Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 266ec4e2b78a094c01dd21b0cbfb5a7a0af1dd88 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
This lets you disable it for some worlds and lower it for others.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 17755108a..6fe3c0ea8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -244,4 +244,10 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 5e7a68c4b..18635e820 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -490,13 +490,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -63,7 +63,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 7d83c0236..466ea22be 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2902,8 +2902,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -78,7 +78,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public LongSet ag() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d277a640c..8ce32dcff 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,7 +1001,7 @@ public final class CraftServer implements Server {
@ -91,10 +91,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
for (int j = -short1; j <= short1; j += 16) {
for (int k = -short1; k <= short1; k += 16) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 088e7f1f1..6afe4d463 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1280,8 +1280,9 @@ public class CraftWorld implements World {
@@ -1428,8 +1428,9 @@ public class CraftWorld implements World {
int chunkCoordX = chunkcoordinates.getX() >> 4;
int chunkCoordZ = chunkcoordinates.getZ() >> 4;
// Cycle through the 25x25 Chunks around it to load/unload the chunks.

22
Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From fb6a6c45bb488b2b412351ffdc83baac4b87fedf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -20,7 +20,7 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
a spare chunk is added to the server thats outside of view distance.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index ff1a2046f..0cd15c17e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -296,4 +296,18 @@ public class PaperWorldConfig {
@ -43,7 +43,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index e00b432ce..9d064d4fc 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -36,6 +36,7 @@ public class Chunk implements IChunkAccess {
@ -55,7 +55,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public final int locZ;
private boolean l;
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 71ddaf591..39ac032b0 100644
--- a/src/main/java/net/minecraft/server/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -48,6 +48,15 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -75,7 +75,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 42d0731f0..e32c9f9a6 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -306,6 +306,19 @@ public class ChunkProviderServer implements IChunkProvider {
@ -99,7 +99,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
this.chunkScheduler.a(booleansupplier);
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index ac0e90eec..2fd8fa30e 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -33,8 +33,22 @@ public class PlayerChunk {
@ -160,7 +160,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 1318ddd99..bc67565bf 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -460,7 +460,13 @@ public class PlayerChunkMap {
@ -179,7 +179,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 8aa4138a2..225f7574d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1342,7 +1342,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -198,10 +198,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
this.methodProfiler.a(() -> {
return String.valueOf(TileEntityTypes.a(tileentity.C()));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 6afe4d463..0b3de7a76 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1633,7 +1633,7 @@ public class CraftWorld implements World {
@@ -1781,7 +1781,7 @@ public class CraftWorld implements World {
ChunkProviderServer cps = world.getChunkProviderServer();
for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
// If in use, skip it
@ -211,7 +211,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index dfa59bbdd..8f0a999b0 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -319,6 +319,11 @@ public class ActivationRange

8
Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 364f74a31e5d72d9a339f77282f85c27db8f59a8 Mon Sep 17 00:00:00 2001
From 3b2f3e7b47b162860acc8996994b710c83082a64 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:24:46 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3536433d14..f83a28dfda 100644
index 0b3de7a76..e0d91ff69 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -82,6 +82,29 @@ public class CraftWorld implements World {
@@ -87,6 +87,29 @@ public class CraftWorld implements World {
private int chunkLoadCount = 0;
private int chunkGCTickCount;
@ -41,5 +41,5 @@ index 3536433d14..f83a28dfda 100644
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
--
2.19.0
2.19.1

10
Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
Datei anzeigen

@ -1,4 +1,4 @@
From d470ccd2730c7898a6036ed37307d897ae1c72de Mon Sep 17 00:00:00 2001
From 759515324317d0bb197271d3904fff448cbd9aa7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 16:06:44 -0500
Subject: [PATCH] Enforce Sync Chunk Unloads
@ -7,10 +7,10 @@ Unloading Chunks async is extremely dangerous. This will force it to main
the same way we handle async chunk loads.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f83a28dfda..8aa3ffdde0 100644
index e0d91ff69..dbc8dc4b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -230,6 +230,7 @@ public class CraftWorld implements World {
@@ -235,6 +235,7 @@ public class CraftWorld implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -18,7 +18,7 @@ index f83a28dfda..8aa3ffdde0 100644
net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z, false, false);
if (chunk == null) {
return true;
@@ -237,6 +238,7 @@ public class CraftWorld implements World {
@@ -242,6 +243,7 @@ public class CraftWorld implements World {
// If chunk had previously been queued to save, must do save to avoid loss of that data
return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save);
@ -27,5 +27,5 @@ index f83a28dfda..8aa3ffdde0 100644
public boolean regenerateChunk(int x, int z) {
--
2.19.0
2.19.1

30
Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
Datei anzeigen

@ -1,4 +1,4 @@
From c4b3587065b1ea9a389610659cad506f528c5bb5 Mon Sep 17 00:00:00 2001
From 1915eebcc8a56f47762305edbb8a0943e23d972a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:31:46 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
Replaces isFromBottle() with logic that persists entity reloads too.
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 7818a3b6a7..d55b076f5d 100644
index bb8b450ac..163ce42c6 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -454,13 +454,13 @@ public class Block implements IMaterial {
@ -28,7 +28,7 @@ index 7818a3b6a7..d55b076f5d 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index b9afeaf72e..2c735a920d 100644
index 69c8e245b..8993fe1ad 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@ -41,7 +41,7 @@ index b9afeaf72e..2c735a920d 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 880f496526..31c8d4bc86 100644
index 1e25ade7c..3e2312b86 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@ -120,7 +120,7 @@ index 880f496526..31c8d4bc86 100644
public void d(EntityHuman entityhuman) {
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 81de03084a..4c92896ef8 100644
index e33ecfcda..b164aff93 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@ -133,7 +133,7 @@ index 81de03084a..4c92896ef8 100644
// CraftBukkit end
if (itemstack1.getItem().a(TagsItem.FISHES)) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 91f831326c..398ad151a0 100644
index b2b575d0e..48bb14805 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
@ -147,7 +147,7 @@ index 91f831326c..398ad151a0 100644
this.expToDrop = 0;
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
index a5e1939e05..e73dba09a6 100644
index a5e1939e0..e73dba09a 100644
--- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
+++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
@@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@ -160,7 +160,7 @@ index a5e1939e05..e73dba09a6 100644
this.die();
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index f03092f4d1..e37fca5b12 100644
index f05a1483f..70f54b1fb 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -411,7 +411,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -173,7 +173,7 @@ index f03092f4d1..e37fca5b12 100644
if (this.tradingPlayer instanceof EntityPlayer) {
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
index 4a128f707b..b870964674 100644
index 4a128f707..b87096467 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
@@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@ -186,7 +186,7 @@ index 4a128f707b..b870964674 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 1bfa7e5e69..4e44180329 100644
index 1bfa7e5e6..4e4418032 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -385,7 +385,7 @@ public class PlayerInteractManager {
@ -199,7 +199,7 @@ index 1bfa7e5e69..4e44180329 100644
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
index 22c47c63c7..52e296d468 100644
index 22c47c63c..52e296d46 100644
--- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
+++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
@@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@ -221,10 +221,10 @@ index 22c47c63c7..52e296d468 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8aa3ffdde0..a258e8208b 100644
index dbc8dc4b9..fe53db5d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1215,7 +1215,7 @@ public class CraftWorld implements World {
@@ -1363,7 +1363,7 @@ public class CraftWorld implements World {
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
entity = new EntityTNTPrimed(world, x, y, z, null);
} else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@ -234,7 +234,7 @@ index 8aa3ffdde0..a258e8208b 100644
// not sure what this can do
if (LightningStrike.class.isAssignableFrom(clazz)) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
index 3a09cab3d4..3302af0e45 100644
index 3a09cab3d..3302af0e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
@@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@ -257,5 +257,5 @@ index 3a09cab3d4..3302af0e45 100644
public EntityExperienceOrb getHandle() {
return (EntityExperienceOrb) entity;
--
2.19.0
2.19.1

10
Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 2954712fa48765b5b56059acb6ff7a3337e582ca 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/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 9565b7527..5b7f0215f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -37,7 +37,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
} catch (Throwable throwable) {
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index ba4301346..7f84957bb 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@ -49,10 +49,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if ( entity.world.spigotConfig.nerfSpawnerMobs )
{
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 2858f11ee..5689f8390 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -834,5 +834,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -841,5 +841,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
Location origin = getHandle().origin;
return origin == null ? null : origin.clone();
}

8
Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 9c88a6860c9857c1ab2423f6edd26e11d5836772 Mon Sep 17 00:00:00 2001
From 00cd9b171c9374b53c83a5f08df068c2c749740f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:49:48 -0500
Subject: [PATCH] LivingEntity#setKiller
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 09cf843d46..9acafadbbf 100644
index 716eda990..2f96842bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -253,6 +253,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -278,6 +278,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
}
@ -26,5 +26,5 @@ index 09cf843d46..9acafadbbf 100644
return addPotionEffect(effect, false);
}
--
2.19.0
2.19.1

12
Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
Datei anzeigen

@ -1,4 +1,4 @@
From f274e65f30c13edff060cd5f343b54a830399712 Mon Sep 17 00:00:00 2001
From 4a344899f2509f7795b5146bc8fad27228eab907 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Nov 2017 21:08:22 -0500
Subject: [PATCH] API to get a BlockState without a snapshot
@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
If Tile Entity was null, correct Sign to return empty lines instead of null
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index b3c5766a27..29fe031d85 100644
index b3c5766a2..29fe031d8 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -206,7 +206,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -39,10 +39,10 @@ index b3c5766a27..29fe031d85 100644
return null;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index f19df71fc3..f4c0c0c5e2 100644
index 3dbeb376f..6dd92ced9 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -269,6 +269,20 @@ public class CraftBlock implements Block {
@@ -274,6 +274,20 @@ public class CraftBlock implements Block {
}
public BlockState getState() {
@ -64,7 +64,7 @@ index f19df71fc3..f4c0c0c5e2 100644
switch (material) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index 0558cafe31..d4d9c5fc50 100644
index 0558cafe3..d4d9c5fc5 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -23,20 +23,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@ -114,7 +114,7 @@ index 0558cafe31..d4d9c5fc50 100644
private T createSnapshot(T tileEntity, World world) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
index e6f86cc4b1..3a8f643609 100644
index e6f86cc4b..3a8f64360 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -15,10 +15,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements

16
Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9a871f17c9a198eb5bc9b74e789ea310e2fca616 Mon Sep 17 00:00:00 2001
From fcf7838985692e85f2b8dc0451b53c608c21e454 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:36:25 -0500
Subject: [PATCH] Add setPlayerProfile API for Skulls
@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
which commonly cause rate limit issues with Mojang API
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
index ad7a2dd170..207546f03a 100644
index 110e04597..c260af11c 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
@@ -1,5 +1,7 @@
@ -18,15 +18,15 @@ index ad7a2dd170..207546f03a 100644
import com.google.common.base.Preconditions;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.MinecraftServer;
@@ -14,6 +16,7 @@ import org.bukkit.block.BlockFace;
import org.bukkit.block.Skull;
@@ -16,6 +18,7 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Directional;
import org.bukkit.block.data.Rotatable;
import org.bukkit.craftbukkit.entity.CraftPlayer;
+import javax.annotation.Nullable;
public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull {
@@ -104,6 +107,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
@@ -106,6 +109,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
}
}
@ -46,9 +46,9 @@ index ad7a2dd170..207546f03a 100644
+
@Override
public BlockFace getRotation() {
return ((Rotatable) getBlockData()).getRotation();
BlockData blockData = getBlockData();
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
index 2ea2a355ba..398cf958cc 100644
index 2ea2a355b..398cf958c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@ -90,5 +90,5 @@ index 2ea2a355ba..398cf958cc 100644
public OfflinePlayer getOwningPlayer() {
if (hasOwner()) {
--
2.19.0
2.19.1

10
Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 22cea100009c3346d73e002abd6786f2766a9795 Mon Sep 17 00:00:00 2001
From 5a55d82dd5c5d083d78989e118dfc04954b88b5e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 15 Aug 2017 22:29:12 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 65fe50882b..ee06457653 100644
index 682e0b87e..a5dfc1ebf 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1206,12 +1206,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -34,10 +34,10 @@ index 65fe50882b..ee06457653 100644
if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a258e8208b..cb5efa6299 100644
index fe53db5d2..6b083daa9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1622,11 +1622,17 @@ public class CraftWorld implements World {
@@ -1770,11 +1770,17 @@ public class CraftWorld implements World {
@Override
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
@ -57,5 +57,5 @@ index a258e8208b..cb5efa6299 100644
x, y, z, // Position
count, // Count
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 92b63fc82b3f37c99206b5b1263e8b27b6cf7332 Mon Sep 17 00:00:00 2001
From 170f9bfdcfc0f301f5a250b1210a4919019662da Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Jun 2018 20:39:20 -0400
Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
Item can be set inside of the Consumer pre spawn function.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index cb5efa6299..2db0742568 100644
index 6b083daa9..1500c4a42 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -931,6 +931,10 @@ public class CraftWorld implements World {
@@ -1079,6 +1079,10 @@ public class CraftWorld implements World {
if (Boat.class.isAssignableFrom(clazz)) {
entity = new EntityBoat(world, x, y, z);
entity.setPositionRotation(x, y, z, yaw, pitch);
@ -23,5 +23,5 @@ index cb5efa6299..2db0742568 100644
entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
} else if (Projectile.class.isAssignableFrom(clazz)) {
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch
Datei anzeigen

@ -1,4 +1,4 @@
From cce32d2f2e5368d30242a44a4f7657f7b6d90928 Mon Sep 17 00:00:00 2001
From 317790884a5372d33d4427690f75228d45d1f964 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 10 Jun 2018 20:20:15 -0400
Subject: [PATCH] Fix CraftEntity hashCode
@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
However, replaced it too to make it clearer of intent.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4e818198b2..f4af6ea034 100644
index 5689f8390..9aa9882e5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -537,14 +537,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -544,14 +544,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
final CraftEntity other = (CraftEntity) obj;
@ -45,5 +45,5 @@ index 4e818198b2..f4af6ea034 100644
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
--
2.19.0
2.19.1

12
Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 1c2e1f99cacb6123fce53f8942c700cda2c4c87d Mon Sep 17 00:00:00 2001
From 027171f9caed4d7ad70d60aa8c9bc9fc2a9793a5 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 16 Jun 2018 01:18:16 -0500
Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index a005c8c4ec..bd4cca26c7 100644
index a005c8c4e..bd4cca26c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -428,4 +428,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index a005c8c4ec..bd4cca26c7 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f5770884b0..566f6e3a6a 100644
index 666e3aaf6..d89f1fe03 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2703,7 +2703,7 @@ public abstract class EntityLiving extends Entity {
@ -49,10 +49,10 @@ index f5770884b0..566f6e3a6a 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 9acafadbbf..a09cd02403 100644
index 2f96842bb..8e65bfc78 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -533,5 +533,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -558,5 +558,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setArrowsStuck(int arrows) {
getHandle().setArrowCount(arrows);
}
@ -69,5 +69,5 @@ index 9acafadbbf..a09cd02403 100644
// Paper end
}
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0276-Expand-Explosions-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From b667575c43a3cf9270ccfda0640964d7a70fc453 Mon Sep 17 00:00:00 2001
From 10a9794d64920edae3b98ae7bdf742cf50cf5a4e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Jun 2018 23:17:24 -0400
Subject: [PATCH] Expand Explosions API
@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2db0742568..da141748bd 100644
index 1500c4a42..767dc87dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -543,6 +543,11 @@ public class CraftWorld implements World {
@@ -548,6 +548,11 @@ public class CraftWorld implements World {
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
}
@ -22,5 +22,5 @@ index 2db0742568..da141748bd 100644
public boolean createExplosion(Location loc, float power) {
return createExplosion(loc, power, false);
--
2.19.0
2.19.1

10
Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From b38b8d9b970ba9669dff79d66e7e6ab750b7394b Mon Sep 17 00:00:00 2001
From 69b571c2f29805b8ffff38da2d4ac5e3b4960a52 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jun 2018 00:21:28 -0400
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a8f58a13fe..c051200da8 100644
index 18517704c..a8103ff68 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@ -32,10 +32,10 @@ index a8f58a13fe..c051200da8 100644
return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index a09cd02403..0860f2334d 100644
index 8e65bfc78..52834b6da 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -543,5 +543,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -568,5 +568,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setShieldBlockingDelay(int delay) {
getHandle().setShieldBlockingDelay(delay);
}
@ -62,5 +62,5 @@ index a09cd02403..0860f2334d 100644
// Paper end
}
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
Datei anzeigen

@ -1,14 +1,14 @@
From bd43029a77d22976f860f0827bb778454c33adb5 Mon Sep 17 00:00:00 2001
From 51e1884b784aa8d72f01558878e449fad4e643a8 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:08:14 +0200
Subject: [PATCH] Implement World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index da141748bd..b37864e2b8 100644
index 767dc87dd..a7be13c9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -751,6 +751,14 @@ public class CraftWorld implements World {
@@ -899,6 +899,14 @@ public class CraftWorld implements World {
return list;
}
@ -24,5 +24,5 @@ index da141748bd..b37864e2b8 100644
// Spigot start
save(true);
--
2.19.0
2.19.1

20
Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 8948cdbcaadd59e45c1fc842cc8b5a75db06eeb1 Mon Sep 17 00:00:00 2001
From 300fb54a858bda8b9e47f38237bc5fa8d7bf1e34 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:18:27 -0400
Subject: [PATCH] Ignore Dead Entities in entityList iteration
@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
they shouldn't of been in the list in the first place.
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
index 56700fc596..9b9c8361e9 100644
index 56700fc59..9b9c8361e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@ -23,7 +23,7 @@ index 56700fc596..9b9c8361e9 100644
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 965cd592f3..1dd56aec38 100644
index 8fa36cd65..0de0dc293 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -35,7 +35,7 @@ index 965cd592f3..1dd56aec38 100644
public float length;
public float J;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0331512468..eb6d2b9d51 100644
index 965a598db..2aa4946c7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1112,6 +1112,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -71,10 +71,10 @@ index 0331512468..eb6d2b9d51 100644
if (entity instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b37864e2b8..52d36052b2 100644
index a7be13c9c..911ea5ca0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -638,6 +638,7 @@ public class CraftWorld implements World {
@@ -643,6 +643,7 @@ public class CraftWorld implements World {
for (Object o : world.entityList) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -82,7 +82,7 @@ index b37864e2b8..52d36052b2 100644
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -656,6 +657,7 @@ public class CraftWorld implements World {
@@ -661,6 +662,7 @@ public class CraftWorld implements World {
for (Object o : world.entityList) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -90,7 +90,7 @@ index b37864e2b8..52d36052b2 100644
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -680,6 +682,7 @@ public class CraftWorld implements World {
@@ -685,6 +687,7 @@ public class CraftWorld implements World {
for (Object entity: world.entityList) {
if (entity instanceof net.minecraft.server.Entity) {
@ -98,7 +98,7 @@ index b37864e2b8..52d36052b2 100644
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
@@ -702,6 +705,7 @@ public class CraftWorld implements World {
@@ -707,6 +710,7 @@ public class CraftWorld implements World {
for (Object entity: world.entityList) {
if (entity instanceof net.minecraft.server.Entity) {
@ -107,5 +107,5 @@ index b37864e2b8..52d36052b2 100644
if (bukkitEntity == null) {
--
2.19.0
2.19.1

14
Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 1efc6803869785dd7deddc227ef1311457fb0667 Mon Sep 17 00:00:00 2001
From 721b6150fa42e830e1bf1258a0e53346d5f3bcf8 Mon Sep 17 00:00:00 2001
From: Mystiflow <mystiflow@gmail.com>
Date: Fri, 6 Jul 2018 13:21:30 +0100
Subject: [PATCH] Send nearby packets from world player list not server list
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a9b468facd..9a064d1618 100644
index 813f6d1fd..73bd0dc4a 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1202,8 +1202,25 @@ public abstract class PlayerList {
@ -46,7 +46,7 @@ index a9b468facd..9a064d1618 100644
double d5 = d1 - entityplayer.locY;
double d6 = d2 - entityplayer.locZ;
diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
index e26405d341..23f390c221 100644
index e26405d34..23f390c22 100644
--- a/src/main/java/net/minecraft/server/WorldManager.java
+++ b/src/main/java/net/minecraft/server/WorldManager.java
@@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@ -95,7 +95,7 @@ index e26405d341..23f390c221 100644
if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
double d0 = (double) blockposition.getX() - entityplayer.locX;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 72c661ef2d..ad3fea9c97 100644
index 17758c813..6e54b71e8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -119,10 +119,10 @@ index 72c661ef2d..ad3fea9c97 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 52d36052b2..8565de51f4 100644
index 911ea5ca0..59d94dd88 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1497,7 +1497,7 @@ public class CraftWorld implements World {
@@ -1645,7 +1645,7 @@ public class CraftWorld implements World {
double z = loc.getZ();
PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
@ -132,5 +132,5 @@ index 52d36052b2..8565de51f4 100644
public String getGameRuleValue(String rule) {
--
2.19.0
2.19.1

8
Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 01bd6b8df3d94c248bee873ed40243024998f936 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Wed, 29 Aug 2018 00:37:42 -0400
Subject: [PATCH] Implement Force-Loaded Chunk API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 12c6d850d..b9371e3ae 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@ -28,10 +28,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
Arrays.fill(emptySkyLight, (byte) 0xFF);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 59d94dd88..098280e6d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -590,6 +590,12 @@ public class CraftWorld implements World {
@@ -595,6 +595,12 @@ public class CraftWorld implements World {
return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
}

12
Spigot-Server-Patches/0347-Optimize-getChunkIfLoaded-type-calls.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 386e732ca9bc7404fd11a5f37af2e001ba869e6d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 29 Aug 2018 21:59:22 -0400
Subject: [PATCH] Optimize getChunkIfLoaded type calls
@ -10,7 +10,7 @@ Will improve inlining across many hot methods.
Improve getBrightness to not do double chunk map lookups.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 501b91138..e64cb8051 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -378,7 +378,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -23,7 +23,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
neighbor.setNeighborUnloaded(-x, -z);
chunk.setNeighborUnloaded(x, z);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d239fc6d3..a5c655155 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -166,7 +166,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -55,10 +55,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return chunk != null && !chunk.isEmpty();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 098280e6d..2f034a9fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -212,7 +212,7 @@ public class CraftWorld implements World {
@@ -217,7 +217,7 @@ public class CraftWorld implements World {
return false;
}
@ -67,7 +67,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (chunk != null) {
world.getChunkProviderServer().unload(chunk);
}
@@ -231,7 +231,7 @@ public class CraftWorld implements World {
@@ -236,7 +236,7 @@ public class CraftWorld implements World {
private boolean unloadChunk0(int x, int z, boolean save) {
Boolean result = MCUtil.ensureMain("Unload Chunk", () -> { // Paper - Ensure never async

6
Spigot-Server-Patches/0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 5a696ec8fd7df7fcf0d684c7552e3ab765d5d29d Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:34:33 -0700
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 2f034a9fa..604d1dbb3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -289,7 +289,7 @@ public class CraftWorld implements World {
@@ -294,7 +294,7 @@ public class CraftWorld implements World {
public boolean loadChunk(int x, int z, boolean generate) {
org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
chunkLoadCount++;

10
Spigot-Server-Patches/0351-Add-ray-tracing-methods-to-LivingEntity.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 0cc71e0200f90df7b6c4177dc44298298eb63b76 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 3 Sep 2018 18:20:03 -0500
Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index a8103ff68..3a70fa381 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2813,6 +2813,22 @@ public abstract class EntityLiving extends Entity {
@ -32,7 +32,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/net/minecraft/server/MovingObjectPosition.java b/src/main/java/net/minecraft/server/MovingObjectPosition.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 6d5dbe89a..a31f9f607 100644
--- a/src/main/java/net/minecraft/server/MovingObjectPosition.java
+++ b/src/main/java/net/minecraft/server/MovingObjectPosition.java
@@ -28,6 +28,7 @@ public class MovingObjectPosition {
@ -44,10 +44,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return this.e;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 52834b6da..eeab59379 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -169,6 +169,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -171,6 +171,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return blocks.get(0);
}

62
Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 54cdcb2e434baa254f727db260c6bb57fed41bcd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 16:55:04 -0400
Subject: [PATCH] Async Chunk Loading and Generation
@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
should not be touching chunks asynchronously!
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index b703e0848..77d35ac99 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -385,4 +385,57 @@ public class PaperConfig {
@ -106,7 +106,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
new file mode 100644
index 7ac07ac07ac0..7ac07ac07ac0
index 000000000..5c77b6e8e
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
@@ -0,0 +1,281 @@
@ -392,7 +392,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
+
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 246e3bf8b..a08f9e7c2 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -184,6 +184,7 @@ public class Chunk implements IChunkAccess {
@ -404,7 +404,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
Iterator iterator = protochunk.s().iterator();
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 39ac032b0..1662e4eba 100644
--- a/src/main/java/net/minecraft/server/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -510,7 +510,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public Chunk remove(Object object) {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index e64cb8051..7a1f84886 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -35,12 +35,12 @@ public class ChunkProviderServer implements IChunkProvider {
@ -660,7 +660,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 9b4bc3ff6..4c22f6d75 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -120,7 +120,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -687,7 +687,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
completion = new Supplier<NBTTagCompound>() {
public NBTTagCompound get() {
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index bdfc7d81f..a5c4564d6 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -24,7 +24,17 @@ public class ChunkSection {
@ -709,7 +709,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public IBlockData getType(int i, int j, int k) {
return this.blockIds.a(i, j, k);
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 34019bd1b..fc9091c80 100644
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -20,13 +20,14 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@ -780,7 +780,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
protected ProtoChunk a(ChunkCoordIntPair chunkcoordintpair, ChunkStatus chunkstatus, Map<ChunkCoordIntPair, ProtoChunk> map) {
diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 71a3636be..ff0fe2541 100644
--- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
+++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
@@ -3,7 +3,7 @@ package net.minecraft.server;
@ -865,7 +865,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
// Paper start - Anti-Xray - Support default methods
diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 271dc41d4..bd15534c2 100644
--- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
+++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
@@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger;
@ -878,7 +878,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
private final MinecraftServer d;
private final java.nio.file.Path e;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 13c0c7ee8..552be8cd8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -209,7 +209,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -891,7 +891,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
this.aJ = Sets.newHashSet();
this.aL = new double[] { 0.0D, 0.0D, 0.0D};
diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 4698ee99f..dfb45cc4e 100644
--- a/src/main/java/net/minecraft/server/IChunkLoader.java
+++ b/src/main/java/net/minecraft/server/IChunkLoader.java
@@ -6,6 +6,8 @@ import javax.annotation.Nullable;
@ -904,7 +904,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 49fba0979..9ad646f8d 100644
--- a/src/main/java/net/minecraft/server/MathHelper.java
+++ b/src/main/java/net/minecraft/server/MathHelper.java
@@ -142,6 +142,7 @@ public class MathHelper {
@ -916,7 +916,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
fx = fx % 360.0F;
if (fx >= 180.0F) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 763130b03..67722440f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -503,6 +503,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -1014,7 +1014,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
new file mode 100644
index 7ac07ac07ac0..7ac07ac07ac0
index 000000000..5823917a6
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
@@ -0,0 +1,593 @@
@ -1612,7 +1612,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
+
+}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 2c7c8adf7..62c524ef3 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -29,16 +29,59 @@ public class PlayerChunk {
@ -1714,7 +1714,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 95baa1dc8..9f6028586 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -27,10 +27,10 @@ public class PlayerChunkMap {
@ -1774,7 +1774,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
private void e() {
diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 9c34319b6..7149b1472 100644
--- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
+++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
@@ -35,7 +35,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@ -1787,7 +1787,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
this.m = world.getChunkProvider().getChunkGenerator().getSettings();
this.i = world.getSeaLevel();
diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d868149d1..0d45d933e 100644
--- a/src/main/java/net/minecraft/server/SchedulerBatch.java
+++ b/src/main/java/net/minecraft/server/SchedulerBatch.java
@@ -9,6 +9,7 @@ public class SchedulerBatch<K, T extends SchedulerTask<K, T>, R> {
@ -1842,7 +1842,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index a5cf017da..def8730b8 100644
--- a/src/main/java/net/minecraft/server/StructurePiece.java
+++ b/src/main/java/net/minecraft/server/StructurePiece.java
@@ -14,7 +14,7 @@ public abstract class StructurePiece {
@ -1869,7 +1869,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return null;
}
diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 1926c902a..1117e4ae2 100644
--- a/src/main/java/net/minecraft/server/StructureStart.java
+++ b/src/main/java/net/minecraft/server/StructureStart.java
@@ -6,7 +6,7 @@ import java.util.List;
@ -1918,7 +1918,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 016d50d3c..f1495d30c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -46,7 +46,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -2015,7 +2015,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (entity == null) return false;
if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index fa99fe014..4f49786aa 100644
--- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
+++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
@@ -9,24 +9,29 @@ import java.util.Random;
@ -2162,7 +2162,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 6e54b71e8..a54ea5a69 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -731,7 +731,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -2175,7 +2175,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 6d72db7bd..32bf4e589 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1014,8 +1014,12 @@ public final class CraftServer implements Server {
@ -2203,10 +2203,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 604d1dbb3..fd494e9fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -157,6 +157,16 @@ public class CraftWorld implements World {
@@ -162,6 +162,16 @@ public class CraftWorld implements World {
}
}
@ -2223,7 +2223,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public Chunk getChunkAt(int x, int z) {
return this.world.getChunkProviderServer().getChunkAt(x, z, true, true).bukkitChunk;
}
@@ -1333,10 +1343,13 @@ public class CraftWorld implements World {
@@ -1481,10 +1491,13 @@ public class CraftWorld implements World {
int chunkCoordZ = chunkcoordinates.getZ() >> 4;
// Cycle through the 25x25 Chunks around it to load/unload the chunks.
int radius = world.paperConfig.keepLoadedRange / 16; // Paper
@ -2241,7 +2241,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
unloadChunk(chunkCoordX + x, chunkCoordZ + z);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d6bf1e39b..e5822c83e 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -78,6 +78,7 @@ public class CraftEventFactory {
@ -2303,7 +2303,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (!event.isCancelled()) {
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 9c2adb235..62c197b80 100644
--- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
@@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin

14
Spigot-Server-Patches/0382-Add-LivingEntity-getTargetEntity.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 4e76f0d704ff2f74911023600819ad3a3fac2a7f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Sep 2018 00:33:08 -0500
Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 19819b134..49228a884 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -102,6 +102,7 @@ public class AxisAlignedBB {
@ -46,7 +46,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
return this.a(vec3d, vec3d1, (BlockPosition)null);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index dd96b09e6..d60dab95f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1519,6 +1519,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -71,7 +71,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return this.d(this.pitch, this.yaw);
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index c27807ea2..923bc0cc7 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@ -130,7 +130,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 42b3d3fc5..61806bbc4 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -18,6 +18,7 @@ public final class IEntitySelector {
@ -142,10 +142,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return !(entity instanceof EntityHuman) || !((EntityHuman)entity).isSpectator();
};
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index eeab59379..d6a4bc64a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -184,6 +184,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -186,6 +186,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
return rayTrace == null ? null : new com.destroystokyo.paper.block.TargetBlockInfo(org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, rayTrace.getBlockPosition()), net.minecraft.server.MCUtil.toBukkitBlockFace(rayTrace.direction));
}

12
Spigot-Server-Patches/0383-Add-sun-related-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From e240df1616d264e53c818b12564e6ba4b1d560de Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:21 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 5aea6629f..fd4a77c1a 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1286,6 +1286,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,7 +17,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (this.world.L() && !this.world.isClientSide) {
float f = this.az();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 23529954b..7914f9b60 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -29,10 +29,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return this.G < 4;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index fd494e9fc..29dc2c270 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -542,6 +542,12 @@ public class CraftWorld implements World {
@@ -547,6 +547,12 @@ public class CraftWorld implements World {
}
}
@ -46,7 +46,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return createExplosion(x, y, z, power, false, true);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 53c2d154e..40a429942 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {

84
Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From f3e4d066305817657c285030f97479dd74f4303c Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Thu, 4 Oct 2018 10:08:02 -0500
Subject: [PATCH] Use EntityTypes for living entities
diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 5a0cc6d05..d385f647e 100644
--- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
+++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
@@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@ -18,7 +18,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index f7ea9f9b8..dfa3bd685 100644
--- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
+++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
@@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@ -40,7 +40,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityirongolem.setPlayerCreated(true);
entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 924d15649..9e9fa7d58 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block {
@ -53,7 +53,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityturtle.setAgeRaw(-24000);
entityturtle.g(blockposition);
diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 7904b1262..38fc40e50 100644
--- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
+++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
@@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@ -66,7 +66,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index e083ea483..56bd827e3 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -361,7 +361,7 @@ public class EnderDragonBattle {
@ -79,7 +79,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
this.d.addEntity(entityenderdragon);
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index efb728d04..3bfbf4752 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@ -92,7 +92,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public boolean f(ItemStack itemstack) {
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index b2e50f853..9c7bf12b8 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@ -105,7 +105,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public float getHeadHeight() {
diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index c82b5f3ab..ba53e9b0b 100644
--- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
+++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
@@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@ -118,7 +118,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityendermite.a(true);
entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 2d9631c5d..16d94fe3f 100644
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -221,7 +221,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@ -131,7 +131,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null);
entityvex.a(EntityEvoker.this);
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 51a07311f..f20196388 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -205,10 +205,10 @@ public class EntityHorse extends EntityHorseAbstract {
@ -148,7 +148,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
int i;
if (j < 4) {
diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 50c0a8277..627ba1038 100644
--- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
+++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
@@ -38,7 +38,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@ -161,7 +161,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return (EntityAgeable)object;
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index ba6c0e96a..17850e857 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@ -174,7 +174,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 560eac4af..4b928d2c7 100644
--- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
+++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -40,7 +40,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@ -187,7 +187,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 774e4d641..0cf53b69f 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -272,7 +272,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@ -200,7 +200,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
EntityLlama entityllama2 = (EntityLlama)entityageable;
int i = this.random.nextInt(Math.max(this.getStrength(), entityllama2.getStrength())) + 1;
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 13a6ddac5..d02455b39 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -35,7 +35,7 @@ public class EntityMushroomCow extends EntityCow {
@ -222,7 +222,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d2e25f04b..90a7e00a0 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -244,7 +244,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
entityocelot.setAgeRaw(-24000);
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index b405e63e8..b0802e12d 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -150,7 +150,7 @@ public class EntityPig extends EntityAnimal {
@ -266,7 +266,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public boolean f(ItemStack itemstack) {
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index b9124a5b0..cb3e45f14 100644
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
+++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -15,7 +15,7 @@ public class EntityPolarBear extends EntityAnimal {
@ -279,7 +279,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public boolean f(ItemStack var1) {
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index b8ca53003..747409af0 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@ -292,7 +292,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (this.random.nextInt(20) != 0) {
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 4a9a9f9da..db4c3aa60 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -264,7 +264,7 @@ public class EntitySheep extends EntityAnimal {
@ -305,7 +305,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
return entitysheep1;
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 761c94bdf..ffbd572dd 100644
--- a/src/main/java/net/minecraft/server/EntitySpider.java
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@ -318,7 +318,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 2c1db9b78..0d88314de 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@ -331,7 +331,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public boolean f(ItemStack itemstack) {
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 6b6fbfd79..29d5ef4c1 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@ -343,7 +343,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public T a(World world) {
return this.aT.apply(world); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index c7d6aa238..5435d3980 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -596,7 +596,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -365,7 +365,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
// Paper start
if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index af9aef76f..68db6af62 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java
+++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -343,7 +343,7 @@ public class EntityWolf extends EntityTameableAnimal {
@ -378,7 +378,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (uuid != null) {
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 04d25ad76..c6413ef2a 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -209,7 +209,7 @@ public class EntityZombie extends EntityMonster {
@ -418,7 +418,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 85d402965..0cca7b6d5 100644
--- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
+++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@ -431,7 +431,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index c1f8984a0..786ab0b29 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -114,7 +114,7 @@ public class EntityZombieVillager extends EntityZombie {
@ -444,7 +444,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityvillager.u(this);
entityvillager.setProfession(this.getProfession());
diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 9e4078148..a4fab5c23 100644
--- a/src/main/java/net/minecraft/server/ItemArmorStand.java
+++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
@@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@ -457,7 +457,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 413188e97..476b840ae 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
@@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@ -470,7 +470,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d4fdcbdfd..887e4461f 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
@@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@ -492,7 +492,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 560edb523..f9b58b972 100644
--- a/src/main/java/net/minecraft/server/VillageSiege.java
+++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -134,7 +134,7 @@ public class VillageSiege {
@ -505,7 +505,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
} catch (Exception exception) {
exception.printStackTrace();
diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index d53911594..83f55adba 100644
--- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
+++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
@@ -174,7 +174,7 @@ public class WorldGenEndCityPieces {
@ -527,7 +527,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityshulker.g(blockposition);
generatoraccess.addEntity(entityshulker);
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 50fe0e16b..ceb37aab4 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
@@ -146,7 +146,7 @@ public class WorldGenFeatureOceanRuinPieces {
@ -540,7 +540,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null);
diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 6ab249ee7..c9a17e332 100644
--- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
+++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
@@ -37,7 +37,7 @@ public class WorldGenMonumentPieces {
@ -580,7 +580,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
for(WorldGenMonumentPieces.WorldGenMonumentStateTracker worldgenmonumentpieces$worldgenmonumentstatetracker4 : aworldgenmonumentpieces$worldgenmonumentstatetracker) {
if (worldgenmonumentpieces$worldgenmonumentstatetracker4 != null) {
diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index e327e2a28..c63b535ee 100644
--- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
+++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
@@ -1656,7 +1656,7 @@ public class WorldGenVillagePieces {
@ -602,7 +602,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index a05e0657b..7062b0cec 100644
--- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
+++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
@@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@ -615,7 +615,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entitywitch.di();
entitywitch.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, 0.0F, 0.0F);
diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index ee401980f..9ca9306d0 100644
--- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
+++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
@@ -197,7 +197,7 @@ public class WorldGenWoodlandMansionPieces {
@ -686,7 +686,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity)null, (NBTTagCompound)null);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 818e4c376..4f9029c33 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -511,7 +511,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -699,10 +699,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
entityhorseskeleton.s(true);
entityhorseskeleton.setAgeRaw(0);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 29dc2c270..85cc4c4bd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1048,153 +1048,153 @@ public class CraftWorld implements World {
@@ -1196,153 +1196,153 @@ public class CraftWorld implements World {
entity.setPositionRotation(x, y, z, 0, 0);
} else if (LivingEntity.class.isAssignableFrom(clazz)) {
if (Chicken.class.isAssignableFrom(clazz)) {

2
work/Bukkit

@ -1 +1 @@
Subproject commit e6583aca258eee05ee4dda7641ea1d2fb0707294
Subproject commit 22452b38c85e0102384f663d80cb179916e9477c

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit a835b035387ca35589e89a221bef88d6b255b046
Subproject commit 5184216f2788fb1bd722dfe1ac53ee2f4c2f4177

2
work/Spigot

@ -1 +1 @@
Subproject commit a1ba5fe5127f8bc4399ff4d23828701b24563f27
Subproject commit eb2155744f0f2446c46971d66ad4ce070a2be7fe