spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2023-04-02 15:03:15 +10:00
parent 6ad4b93c2a
commit b31949f2f3
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
25 changed files with 156 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Bukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From fa6f89d4c9af888cd6abe2b093490ca315234c5d Mon Sep 17 00:00:00 2001
From cc718a3434bda5503df0320dacbf7f556ad169b5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
@ -37,10 +37,10 @@ index ac380d4f..2fdf0363 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 456b8d93..9d9e6419 100644
index a4cb298c..ca2990c4 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2674,6 +2674,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2685,6 +2685,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
@ -120,10 +120,10 @@ index 76aad05f..4d308c5a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 0c377ac3..f0ce49c4 100644
index 5cf60bae..94d3979e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1668,4 +1668,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1711,4 +1711,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return whether the player allows server listings
*/
public boolean isAllowingServerListings();

6
Bukkit-Patches/0004-BungeeCord-Support.patch
View file

@ -1,14 +1,14 @@
From df0e118ec3535b2458ac8ee5b635048fd8f96afb Mon Sep 17 00:00:00 2001
From 15fe747d78115956ca01ade5b984e2c53de6515f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f0ce49c4..c31151be 100644
index 94d3979e..6b7d5a99 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1672,6 +1672,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1715,6 +1715,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {

6
Bukkit-Patches/0007-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 182ade4ca3d533d08a594eb8071095215e2a30bb Mon Sep 17 00:00:00 2001
From 33de2cfff037417e47164ff7129047df67028cd1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c31151be..4c234fba 100644
index 6b7d5a99..ea2f78df 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1682,6 +1682,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1725,6 +1725,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0008-Add-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 46d5954700befdc2c2cd5f95abe80dc73a795593 Mon Sep 17 00:00:00 2001
From 1a9667284dc5553f043c721de7134db70f9cd6aa Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4c234fba..b08ead82 100644
index ea2f78df..040345cf 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1705,6 +1705,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1748,6 +1748,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void setCollidesWithEntities(boolean collides) {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0009-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 46d8c7fb81959873efd5c0933c143499feef50df Mon Sep 17 00:00:00 2001
From d23493dc55fd5292598d2e0a67befacbcc9c148f Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b08ead82..1eb88727 100644
index 040345cf..6135a340 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1712,6 +1712,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1755,6 +1755,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0010-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 67d34d73658b618a83a4ad6a6509140f709c8a77 Mon Sep 17 00:00:00 2001
From 1c5b65ad36946588f50980ba248415ab8766bbf4 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 9d9e6419..55457046 100644
index ca2990c4..3d991a9b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2677,6 +2677,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2688,6 +2688,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
// Spigot start
public class Spigot {

6
Bukkit-Patches/0012-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,14 +1,14 @@
From 81c7143d7c4a65e835890a0d713d9aa40d552e35 Mon Sep 17 00:00:00 2001
From e3651c1afb7a87e9e8104d64937aa89e49d80de5 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1eb88727..7615502d 100644
index 6135a340..e2bbf040 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -671,10 +671,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -714,10 +714,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Forces an update of the player's entire inventory.
*

16
Bukkit-Patches/0013-BungeeCord-Chat-API.patch
View file

@ -1,11 +1,11 @@
From 26d817de3b744119228c159bd90412d4d96ab6b9 Mon Sep 17 00:00:00 2001
From 67e63ec38eb6309b96e5829fb65feda324b6e913 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 02:59:14 +0100
Subject: [PATCH] BungeeCord Chat API
diff --git a/pom.xml b/pom.xml
index 7cff099b..829ebece 100644
index 648d6f78..95228f32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,13 @@
@ -22,16 +22,16 @@ index 7cff099b..829ebece 100644
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -187,6 +194,7 @@
<link>https://guava.dev/releases/31.0.1-jre/api/docs/</link>
<link>https://javadoc.io/doc/org.yaml/snakeyaml/1.30/</link>
@@ -189,6 +196,7 @@
<link>https://guava.dev/releases/31.1-jre/api/docs/</link>
<link>https://javadoc.io/doc/org.yaml/snakeyaml/1.33/</link>
<link>https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/</link>
+ <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
</links>
</configuration>
</plugin>
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index 623bba2e..24ade174 100644
index 6149c77d..e3f185dc 100644
--- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java
@@ -15,91 +15,223 @@ public enum ChatColor {
@ -370,10 +370,10 @@ index 4b6b9540..284be63a 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7615502d..c60e1fc1 100644
index e2bbf040..f2aeb6db 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1720,6 +1720,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1763,6 +1763,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public java.util.Set<Player> getHiddenPlayers() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0015-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 9f8aeaa439e48e875fc33217f07309eaf84577e1 Mon Sep 17 00:00:00 2001
From a53438bcaa6e212d8166e15a9099ee8a8c9934ba Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:47:34 -0700
Subject: [PATCH] View Distance
@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
This commit allows the retrieval of per world view distances.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 55457046..98b9818f 100644
index 3d991a9b..72851fa3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2674,6 +2674,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2685,6 +2685,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);

22
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From afff9c71aa51f574d3817d4f3ca761bcf24c5cbd Mon Sep 17 00:00:00 2001
From a336dbaf3dfb90d7920b1be17d37b4f2307699ce Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -6,7 +6,7 @@ Subject: [PATCH] Skeleton API Implementations
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fba49a3a49..1dc29e8849 100644
index fba49a3a4..1dc29e884 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2305,4 +2305,16 @@ public final class CraftServer implements Server {
@ -27,10 +27,10 @@ index fba49a3a49..1dc29e8849 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d0934ff020..14cd902202 100644
index 01fe9c5b9..69cb5cd99 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1914,4 +1914,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1925,4 +1925,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
this.persistentDataContainer.putAll((NBTTagCompound) c);
}
}
@ -47,7 +47,7 @@ index d0934ff020..14cd902202 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
index f9d3b5a499..b63472322d 100644
index f9d3b5a49..b63472322 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
@@ -132,4 +132,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
@ -63,7 +63,7 @@ index f9d3b5a499..b63472322d 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
index 7fa2588b89..e0acbada89 100644
index 7fa2588b8..e0acbada8 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -90,4 +90,16 @@ public abstract class ServerCommandSender implements CommandSender {
@ -84,7 +84,7 @@ index 7fa2588b89..e0acbada89 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index b8ef570b65..31d6b6832a 100644
index b8ef570b6..31d6b6832 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1149,4 +1149,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -104,7 +104,7 @@ index b8ef570b65..31d6b6832a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
index 9ab9f0a312..e63833dcda 100644
index 9ab9f0a31..e63833dcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -29,4 +29,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
@ -124,10 +124,10 @@ index 9ab9f0a312..e63833dcda 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 05f2258adc..f08746879b 100644
index 18fe96bf1..f54b87e16 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2049,4 +2049,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2089,4 +2089,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isAllowingServerListings() {
return getHandle().allowsListing();
}
@ -144,7 +144,7 @@ index 05f2258adc..f08746879b 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index 8615d7bcfb..967d5ba30b 100644
index 8615d7bcf..967d5ba30 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -349,6 +349,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {

10
CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From d8b06e84e04158460caced12de983fb106296254 Mon Sep 17 00:00:00 2001
From 36de55e62d508838d3cdbb49b246f0b90fab419f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
index 19ca12c97b..09675bf4d5 100644
index 19ca12c97..09675bf4d 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -214,7 +214,10 @@ public class EntityItem extends Entity implements TraceableEntity {
@ -31,10 +31,10 @@ index 19ca12c97b..09675bf4d5 100644
} else {
merge(entityitem, itemstack1, this, itemstack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7a37c193fc..0442d69fc8 100644
index bba9521f4..1523b7d96 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -631,6 +631,23 @@ public class CraftEventFactory {
@@ -647,6 +647,23 @@ public class CraftEventFactory {
return true;
}
event = CraftEventFactory.callLightningStrikeEvent((LightningStrike) entity.getBukkitEntity(), cause);
@ -59,7 +59,7 @@ index 7a37c193fc..0442d69fc8 100644
event = CraftEventFactory.callEntitySpawnEvent(entity);
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index f42972427b..5ff085b9e6 100644
index f42972427..5ff085b9e 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -134,4 +134,18 @@ public class SpigotWorldConfig

40
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From dc4076e750fce0999a3bb9bfa8a853be4c4db591 Mon Sep 17 00:00:00 2001
From c8428ba3bf5db8546875963b654b623f5ae543e1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching
Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index fe8992bb48..e1353632bf 100644
index fe8992bb4..e1353632b 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@@ -1292,6 +1292,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.e {
@ -42,7 +42,7 @@ index fe8992bb48..e1353632bf 100644
Vec3D vec3d = entityplayer.position().subtract(this.entity.position());
double d0 = (double) Math.min(this.getEffectiveRange(), (PlayerChunkMap.this.viewDistance - 1) * 16);
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index db82616d9c..6e38b63bf9 100644
index db82616d9..6e38b63bf 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1034,6 +1034,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -78,7 +78,7 @@ index db82616d9c..6e38b63bf9 100644
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index c07d54bd72..2a733f8eb9 100644
index c07d54bd7..2a733f8eb 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1084,6 +1084,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@ -90,7 +90,7 @@ index c07d54bd72..2a733f8eb9 100644
effectsToProcess.add(new ProcessableEffect(mobeffect, cause));
return true;
diff --git a/src/main/java/net/minecraft/world/item/crafting/CraftingManager.java b/src/main/java/net/minecraft/world/item/crafting/CraftingManager.java
index c7912e8ec5..6751a30592 100644
index c7912e8ec..6751a3059 100644
--- a/src/main/java/net/minecraft/world/item/crafting/CraftingManager.java
+++ b/src/main/java/net/minecraft/world/item/crafting/CraftingManager.java
@@ -86,6 +86,7 @@ public class CraftingManager extends ResourceDataJson {
@ -102,7 +102,7 @@ index c7912e8ec5..6751a30592 100644
if (byName.containsKey(irecipe.getId()) || map.containsKey(irecipe.getId())) {
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
index 39a88e44fa..39b18e2f73 100644
index 39a88e44f..39b18e2f7 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
@@ -145,11 +145,14 @@ public abstract class BlockBase implements FeatureElement {
@ -122,7 +122,7 @@ index 39a88e44fa..39b18e2f73 100644
world.removeBlockEntity(blockposition);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index db1bcca6be..e4bb83d1ef 100644
index db1bcca6b..e4bb83d1e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -816,6 +816,7 @@ public final class CraftServer implements Server {
@ -134,10 +134,10 @@ index db1bcca6be..e4bb83d1ef 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 14cd902202..6d91956aa9 100644
index 69cb5cd99..94eb9fbd4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -264,6 +264,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -276,6 +276,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@ -145,7 +145,7 @@ index 14cd902202..6d91956aa9 100644
if (isChunkLoaded(x, z)) {
world.getChunkSource().removeRegionTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
}
@@ -272,6 +273,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -284,6 +285,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -153,7 +153,7 @@ index 14cd902202..6d91956aa9 100644
if (!isChunkLoaded(x, z)) {
return true;
}
@@ -286,6 +288,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -298,6 +300,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean regenerateChunk(int x, int z) {
@ -161,7 +161,7 @@ index 14cd902202..6d91956aa9 100644
throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
/*
if (!unloadChunk0(x, z, false)) {
@@ -338,6 +341,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -350,6 +353,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@ -169,7 +169,7 @@ index 14cd902202..6d91956aa9 100644
IChunkAccess chunk = world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back.
@@ -837,6 +841,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -848,6 +852,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -177,7 +177,7 @@ index 14cd902202..6d91956aa9 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -991,6 +996,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1002,6 +1007,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void save() {
@ -186,7 +186,7 @@ index 14cd902202..6d91956aa9 100644
boolean oldSave = world.noSave;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 31d6b6832a..4715bb2b9c 100644
index 31d6b6832..4715bb2b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -562,6 +562,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -198,10 +198,10 @@ index 31d6b6832a..4715bb2b9c 100644
List<Entity> notchEntityList = entity.level.getEntities(entity, entity.getBoundingBox().inflate(x, y, z), Predicates.alwaysTrue());
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f08746879b..f72b5ad736 100644
index f54b87e16..c21f1e17f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -368,6 +368,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -369,6 +369,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {
@ -210,7 +210,7 @@ index f08746879b..f72b5ad736 100644
getHandle().connection.disconnect(message == null ? "" : message);
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
index 659c1b272a..329b2fbe07 100644
index 659c1b272..329b2fbe0 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
@@ -41,6 +41,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {
@ -222,7 +222,7 @@ index 659c1b272a..329b2fbe07 100644
scoreboards.add(scoreboard);
return scoreboard;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
index 2e057fd4c0..ddef523ea8 100644
index 2e057fd4c..ddef523ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -12,6 +12,7 @@ public class ServerShutdownThread extends Thread {
@ -235,7 +235,7 @@ index 2e057fd4c0..ddef523ea8 100644
try {
diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
new file mode 100644
index 0000000000..aeed769725
index 000000000..aeed76972
--- /dev/null
+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
@@ -0,0 +1,17 @@

12
CraftBukkit-Patches/0007-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 09c0ea149836827271d242335a5e22fc04a1e77c Mon Sep 17 00:00:00 2001
From 79e6c9f90bbde14fa1ced0bae5a12fea2897932d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
This commit allows the user to select per world view distances.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 6e38b63bf9..d6aae074c7 100644
index 6e38b63bf..d6aae074c 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -275,8 +275,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -21,7 +21,7 @@ index 6e38b63bf9..d6aae074c7 100644
Objects.requireNonNull(this.entityManager);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 0759c8c2d6..0d315ec98e 100644
index 0759c8c2d..0d315ec98 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -237,7 +237,8 @@ public abstract class PlayerList {
@ -44,10 +44,10 @@ index 0759c8c2d6..0d315ec98e 100644
entityplayer1.unsetRemoved();
entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6d91956aa9..63cf8bfbe6 100644
index 94eb9fbd4..bc8042e47 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1921,6 +1921,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1932,6 +1932,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
}
@ -67,7 +67,7 @@ index 6d91956aa9..63cf8bfbe6 100644
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 5ff085b9e6..acaf903011 100644
index 5ff085b9e..acaf90301 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -148,4 +148,36 @@ public class SpigotWorldConfig

38
CraftBukkit-Patches/0008-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From ed2f3e925fd6e886606905f98c7d92783c53e571 Mon Sep 17 00:00:00 2001
From c0efa571edc7bdc8ec97c3c7359de4ec31cfc090 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
Overhauls the Timings System adding performance tracking all around the Minecraft Server
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0762b1e54c..f4fb055c92 100644
index 0762b1e54..f4fb055c9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -191,6 +191,8 @@ import org.bukkit.event.player.AsyncPlayerChatPreviewEvent;
@ -119,7 +119,7 @@ index 0762b1e54c..f4fb055c92 100644
this.profiler.pop();
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 2acde010c2..4c4986ea4b 100644
index 2acde010c..4c4986ea4 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -59,6 +59,7 @@ import org.apache.logging.log4j.Level;
@ -147,7 +147,7 @@ index 2acde010c2..4c4986ea4b 100644
@Override
diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
index 1f25276778..5700a33181 100644
index 1f2527677..5700a3318 100644
--- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
@@ -146,11 +146,13 @@ public class ChunkProviderServer extends IChunkProvider {
@ -205,7 +205,7 @@ index 1f25276778..5700a33181 100644
}
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index d6aae074c7..95f6db3de8 100644
index d6aae074c..95f6db3de 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -168,6 +168,7 @@ import net.minecraft.world.level.storage.WorldDataServer;
@ -282,7 +282,7 @@ index d6aae074c7..95f6db3de8 100644
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 7f362662cc..17b18a3ac0 100644
index 7f362662c..17b18a3ac 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -337,6 +337,7 @@ public class PlayerConnection implements ServerPlayerConnection, TickablePacketL
@ -327,7 +327,7 @@ index 7f362662cc..17b18a3ac0 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6f884402ca..c857ae20f8 100644
index e10e9845f..7d487f4d3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -136,6 +136,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -363,7 +363,7 @@ index 6f884402ca..c857ae20f8 100644
protected boolean isHorizontalCollisionMinor(Vec3D vec3d) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 2a733f8eb9..34603fe88f 100644
index 2a733f8eb..34603fe88 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -141,6 +141,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -442,7 +442,7 @@ index 2a733f8eb9..34603fe88f 100644
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
this.hurt(this.damageSources().drown(), 1.0F);
diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
index ec3287eacb..133022bf79 100644
index ec3287eac..133022bf7 100644
--- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
@@ -117,6 +117,7 @@ public final class SpawnerCreature {
@ -462,7 +462,7 @@ index ec3287eacb..133022bf79 100644
}
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index 130a7e8621..2702eeecf6 100644
index 130a7e862..2702eeecf 100644
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
@@ -88,6 +88,7 @@ import org.bukkit.Bukkit;
@ -524,7 +524,7 @@ index 130a7e8621..2702eeecf6 100644
CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
index 78917dee2a..2567926c51 100644
index 78917dee2..2567926c5 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
@@ -21,8 +21,11 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
@ -540,10 +540,10 @@ index 78917dee2a..2567926c51 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
index b76ef412dd..1e7f90129a 100644
index 3b802bc30..30b01c264 100644
--- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
@@ -892,6 +892,7 @@ public class Chunk extends IChunkAccess {
@@ -887,6 +887,7 @@ public class Chunk extends IChunkAccess {
GameProfilerFiller gameprofilerfiller = Chunk.this.level.getProfiler();
gameprofilerfiller.push(this::getType);
@ -551,7 +551,7 @@ index b76ef412dd..1e7f90129a 100644
IBlockData iblockdata = Chunk.this.getBlockState(blockposition);
if (this.blockEntity.getType().isValid(iblockdata)) {
@@ -909,6 +910,10 @@ public class Chunk extends IChunkAccess {
@@ -904,6 +905,10 @@ public class Chunk extends IChunkAccess {
this.blockEntity.fillCrashReportCategory(crashreportsystemdetails);
throw new ReportedException(crashreport);
@ -563,7 +563,7 @@ index b76ef412dd..1e7f90129a 100644
}
}
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
index b5f0b9753f..080e081ffa 100644
index b5f0b9753..080e081ff 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
@@ -512,10 +512,13 @@ public class ChunkRegionLoader {
@ -589,7 +589,7 @@ index b5f0b9753f..080e081ffa 100644
};
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e4bb83d1ef..2276d148b9 100644
index e4bb83d1e..2276d148b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2314,6 +2314,11 @@ public final class CraftServer implements Server {
@ -606,7 +606,7 @@ index e4bb83d1ef..2276d148b9 100644
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
new file mode 100644
index 0000000000..aff7b6b438
index 000000000..aff7b6b43
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
@@ -0,0 +1,160 @@
@ -771,7 +771,7 @@ index 0000000000..aff7b6b438
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index cd43b45516..4f8a30657e 100644
index cd43b4551..4f8a30657 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -411,7 +411,9 @@ public class CraftScheduler implements BukkitScheduler {
@ -785,7 +785,7 @@ index cd43b45516..4f8a30657e 100644
task.getOwner().getLogger().log(
Level.WARNING,
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index c885bc7443..70794669ff 100644
index c885bc744..70794669f 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -5,7 +5,10 @@ import org.bukkit.Bukkit;

6
CraftBukkit-Patches/0024-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From fb8b7ca67982e8d5cfe57ed56033c942c6c7155c Mon Sep 17 00:00:00 2001
From 5cdca86ce42fe443fecac81edd47a7aabb21b8a8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f72b5ad736..668859a4b7 100644
index c21f1e17f..f5d128ce3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2054,6 +2054,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2094,6 +2094,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0026-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From fa4537a3f03e99c3d0871f0fb8adced247e5e787 Mon Sep 17 00:00:00 2001
From 57d76eb43d30060943b06636c5708c7321347e7a Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 668859a4b7..f89d363803 100644
index f5d128ce3..39001167b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2064,6 +2064,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2104,6 +2104,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

22
CraftBukkit-Patches/0030-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 4e39bf4c41fe6bdc9d92c543a12fac37206f9642 Mon Sep 17 00:00:00 2001
From 6416c0ec06c6de33ec7434c221b949c93703cb2b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
Provides support for IP forwarding via BungeeCord.
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
index 846150da76..9e8b1e9492 100644
index 846150da7..9e8b1e949 100644
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
@@ -76,6 +76,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -21,7 +21,7 @@ index 846150da76..9e8b1e9492 100644
private IChatBaseComponent disconnectedReason;
private boolean encrypted;
diff --git a/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
index e992a972d5..786314a9b7 100644
index e992a972d..786314a9b 100644
--- a/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
+++ b/src/main/java/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
@@ -23,7 +23,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@ -34,7 +34,7 @@ index e992a972d5..786314a9b7 100644
this.intention = EnumProtocol.getById(packetdataserializer.readVarInt());
}
diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
index 3a9ac2a831..8bbbf7d770 100644
index 3a9ac2a83..8bbbf7d77 100644
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
@@ -18,6 +18,11 @@ import java.util.HashMap;
@ -82,7 +82,7 @@ index 3a9ac2a831..8bbbf7d770 100644
break;
case STATUS:
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
index 40f03ce23e..ac36c73e11 100644
index 40f03ce23..ac36c73e1 100644
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
@@ -115,7 +115,25 @@ public class LoginListener implements PacketLoginInListener, TickablePacketListe
@ -113,7 +113,7 @@ index 40f03ce23e..ac36c73e11 100644
public void handleAcceptedLogin() {
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 8e256db350..36a099d138 100644
index 8e256db35..36a099d13 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2046,10 +2046,10 @@ public class PlayerConnection implements ServerPlayerConnection, TickablePacketL
@ -157,7 +157,7 @@ index 8e256db350..36a099d138 100644
public void handleInteract(PacketPlayInUseEntity packetplayinuseentity) {
PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinuseentity, this, this.player.getLevel());
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 381057471e..8570685135 100644
index 381057471..857068513 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -588,7 +588,7 @@ public abstract class PlayerList {
@ -170,7 +170,7 @@ index 381057471e..8570685135 100644
if (getBans().isBanned(gameprofile) && !getBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ce19419d49..ce0310c650 100644
index ce19419d4..ce0310c65 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -721,7 +721,13 @@ public final class CraftServer implements Server {
@ -189,10 +189,10 @@ index ce19419d49..ce0310c650 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f89d363803..188dbd7ee8 100644
index 39001167b..2ed04f68d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2055,6 +2055,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2095,6 +2095,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{
@ -206,7 +206,7 @@ index f89d363803..188dbd7ee8 100644
public boolean getCollidesWithEntities() {
return CraftPlayer.this.isCollidable();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 130016282a..3bb51f4528 100644
index 130016282..3bb51f452 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -214,4 +214,14 @@ public class SpigotConfig

6
CraftBukkit-Patches/0036-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,14 +1,14 @@
From 0f2610a54eca0676beccdfd4f96b18f9bd21907c Mon Sep 17 00:00:00 2001
From 45d182fb8a7298d27c35fd029e28590f11ebb590 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 188dbd7ee8..eb7cf2ef16 100644
index 2ed04f68d..0c2a7969c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1801,7 +1801,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1841,7 +1841,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

6
CraftBukkit-Patches/0046-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 7ddaf3c40e1e7b231fad1daa15da6eaba0d462eb Mon Sep 17 00:00:00 2001
From c82669b029824e2fccc1214c9df8ecc63f809e0c Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index eb7cf2ef16..5b8136f4ac 100644
index 0c2a7969c..818c6e0d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2079,6 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2119,6 +2119,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().respawn( getHandle(), false );
}
}

10
CraftBukkit-Patches/0048-Implement-Silenceable-Lightning-API.patch
View file

@ -1,11 +1,11 @@
From 2c33ea34abc96dcbc90d7639e8dda2853dd4f2db Mon Sep 17 00:00:00 2001
From a7ac86e102f393971ed193aadcdf4cff86923aa6 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
diff --git a/src/main/java/net/minecraft/world/entity/EntityLightning.java b/src/main/java/net/minecraft/world/entity/EntityLightning.java
index 6cfecdd9b1..0d75880e0d 100644
index 6cfecdd9b..0d75880e0 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLightning.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLightning.java
@@ -46,6 +46,7 @@ public class EntityLightning extends Entity {
@ -26,10 +26,10 @@ index 6cfecdd9b1..0d75880e0d 100644
this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 63cf8bfbe6..e6cf00dc32 100644
index bc8042e47..95ead5c85 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1936,6 +1936,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1947,6 +1947,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{
@ -58,7 +58,7 @@ index 63cf8bfbe6..e6cf00dc32 100644
public org.bukkit.World.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
index e63833dcda..8819f7684e 100644
index e63833dcd..8819f7684 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -33,6 +33,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike

18
CraftBukkit-Patches/0064-Further-Seed-Customisation.patch
View file

@ -1,4 +1,4 @@
From 31c1294d29e9850771dd864fc94482437b79445f Mon Sep 17 00:00:00 2001
From 98e651e6077728ba664bdcd14375d9a0c41fe78d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 4 Jul 2014 13:28:45 +1000
Subject: [PATCH] Further Seed Customisation
@ -6,7 +6,7 @@ Subject: [PATCH] Further Seed Customisation
Allow server admins that really want to to customise the seeds used in world generation even further.
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index 299724c497..2516fd68ba 100644
index 299724c49..2516fd68b 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@@ -213,7 +213,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.e {
@ -19,7 +19,7 @@ index 299724c497..2516fd68ba 100644
ThreadedMailbox<Runnable> threadedmailbox = ThreadedMailbox.create(executor, "worldgen");
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java b/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
index 1d80f7cded..ce7cc4b65a 100644
index 1d80f7cde..ce7cc4b65 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
@@ -319,7 +319,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@ -32,7 +32,7 @@ index 1d80f7cded..ce7cc4b65a 100644
if (randomsource.nextInt(10) == 0 && flag && blockposition.getY() < 40) {
return checkMobSpawnRules(entitytypes, generatoraccess, enummobspawn, blockposition, randomsource);
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index 482e0de8af..6fe5c0ef00 100644
index 482e0de8a..6fe5c0ef0 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -102,8 +102,8 @@ public abstract class ChunkGenerator {
@ -47,7 +47,7 @@ index 482e0de8af..6fe5c0ef00 100644
public Optional<ResourceKey<Codec<? extends ChunkGenerator>>> getTypeNameForDataFixer() {
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
index 35f744746c..80eacaf7a2 100644
index 35f744746..80eacaf7a 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
@@ -34,6 +34,11 @@ import net.minecraft.world.level.levelgen.structure.placement.ConcentricRingsStr
@ -149,7 +149,7 @@ index 35f744746c..80eacaf7a2 100644
private static boolean hasBiomesForStructureSet(StructureSet structureset, WorldChunkManager worldchunkmanager) {
Stream<Holder<BiomeBase>> stream = structureset.structures().stream().flatMap((structureset_a) -> {
diff --git a/src/main/java/net/minecraft/world/level/levelgen/ChunkProviderFlat.java b/src/main/java/net/minecraft/world/level/levelgen/ChunkProviderFlat.java
index 6d6b3abd1c..926848b826 100644
index 6d6b3abd1..926848b82 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/ChunkProviderFlat.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/ChunkProviderFlat.java
@@ -49,14 +49,14 @@ public class ChunkProviderFlat extends ChunkGenerator {
@ -170,10 +170,10 @@ index 6d6b3abd1c..926848b826 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index f1fde234bb..ca0f8a7a34 100644
index 01d9473d2..18bed57f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -223,7 +223,7 @@ public class CraftChunk implements Chunk {
@@ -207,7 +207,7 @@ public class CraftChunk implements Chunk {
@Override
public boolean isSlimeChunk() {
// 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
@ -183,7 +183,7 @@ index f1fde234bb..ca0f8a7a34 100644
@Override
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 33d74abad1..ad0a04ff96 100644
index 33d74abad..ad0a04ff9 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -292,4 +292,40 @@ public class SpigotWorldConfig

6
CraftBukkit-Patches/0067-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From 8940d7df5fa5029050b1d47cae026cb21c9aa2fc Mon Sep 17 00:00:00 2001
From c6a8a57db8b7ef37af254b1c323f8f9256af0dfb Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5b8136f4ac..63e17e7e86 100644
index 818c6e0d5..19f5c41b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1882,7 +1882,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1922,7 +1922,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });

16
CraftBukkit-Patches/0075-Add-Hunger-Config-Values.patch
View file

@ -1,14 +1,14 @@
From f4a6c2a5cabfd8be60edf0215518ab5867091814 Mon Sep 17 00:00:00 2001
From 53e15550df8c930658784c2c9805c133f2ea2791 Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values
diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
index 9a57a711bd..2e8c20edb9 100644
index 43f0f3aef..770127525 100644
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
@@ -1381,7 +1381,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1387,7 +1387,7 @@ public abstract class EntityHuman extends EntityLiving {
}
}
@ -17,7 +17,7 @@ index 9a57a711bd..2e8c20edb9 100644
} else {
this.level.playSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F);
if (flag4) {
@@ -1558,9 +1558,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1564,9 +1564,9 @@ public abstract class EntityHuman extends EntityLiving {
super.jumpFromGround();
this.awardStat(StatisticList.JUMP);
if (this.isSprinting()) {
@ -29,7 +29,7 @@ index 9a57a711bd..2e8c20edb9 100644
}
}
@@ -1629,19 +1629,19 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1635,19 +1635,19 @@ public abstract class EntityHuman extends EntityLiving {
i = Math.round((float) Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
if (i > 0) {
this.awardStat(StatisticList.SWIM_ONE_CM, i);
@ -52,7 +52,7 @@ index 9a57a711bd..2e8c20edb9 100644
}
} else if (this.onClimbable()) {
if (d1 > 0.0D) {
@@ -1652,13 +1652,13 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1658,13 +1658,13 @@ public abstract class EntityHuman extends EntityLiving {
if (i > 0) {
if (this.isSprinting()) {
this.awardStat(StatisticList.SPRINT_ONE_CM, i);
@ -70,7 +70,7 @@ index 9a57a711bd..2e8c20edb9 100644
}
} else if (this.isFallFlying()) {
diff --git a/src/main/java/net/minecraft/world/food/FoodMetaData.java b/src/main/java/net/minecraft/world/food/FoodMetaData.java
index bd7584b3d6..3258925268 100644
index bd7584b3d..325892526 100644
--- a/src/main/java/net/minecraft/world/food/FoodMetaData.java
+++ b/src/main/java/net/minecraft/world/food/FoodMetaData.java
@@ -96,7 +96,7 @@ public class FoodMetaData {
@ -83,7 +83,7 @@ index bd7584b3d6..3258925268 100644
}
} else if (this.foodLevel <= 0) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index ad0a04ff96..12a75a1c78 100644
index ad0a04ff9..12a75a1c7 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -328,4 +328,30 @@ public class SpigotWorldConfig

18
CraftBukkit-Patches/0079-BungeeCord-Chat-API.patch
View file

@ -1,11 +1,11 @@
From f1251022ecfe584f80fb8e714b53781ac9f763b5 Mon Sep 17 00:00:00 2001
From de2bb409a92990064c2d9d627710500ca8b73d27 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
index b5a12f0de3..03a73f00f6 100644
index b5a12f0de..03a73f00f 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
@@ -5,7 +5,17 @@ import net.minecraft.network.PacketDataSerializer;
@ -37,7 +37,7 @@ index b5a12f0de3..03a73f00f6 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9689bf967c..c409e12867 100644
index 9689bf967..c409e1286 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -254,6 +254,8 @@ import org.yaml.snakeyaml.Yaml;
@ -71,7 +71,7 @@ index 9689bf967c..c409e12867 100644
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
index 74558e852e..13008357b4 100644
index 74558e852..13008357b 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -103,6 +103,29 @@ public abstract class ServerCommandSender implements CommandSender {
@ -105,7 +105,7 @@ index 74558e852e..13008357b4 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4715bb2b9c..ca97e009f6 100644
index 4715bb2b9..ca97e009f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -193,6 +193,8 @@ import org.bukkit.util.BoundingBox;
@ -145,10 +145,10 @@ index 4715bb2b9c..ca97e009f6 100644
public org.bukkit.entity.Entity.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 63e17e7e86..45d9150d7d 100644
index 19f5c41b2..f7de8e899 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -158,6 +158,8 @@ import org.bukkit.plugin.messaging.StandardMessenger;
@@ -159,6 +159,8 @@ import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.profile.PlayerProfile;
import org.bukkit.scoreboard.Scoreboard;
@ -157,7 +157,7 @@ index 63e17e7e86..45d9150d7d 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -2102,6 +2104,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2142,6 +2144,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}
@ -207,7 +207,7 @@ index 63e17e7e86..45d9150d7d 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index 82c1487db7..ea96eab4e4 100644
index 82c1487db..ea96eab4e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -22,6 +22,9 @@ import org.bukkit.inventory.meta.BookMeta;

8
CraftBukkit-Patches/0083-Implement-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From 9dd170129ce11ab83ee7179b485f96e44c76f483 Mon Sep 17 00:00:00 2001
From 206d82162ebc4d6e0610294fa392bbe027efa401 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -28,10 +28,10 @@ index 50df2abbf..470b3ab71 100644
if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
this.delay(worldserver, blockposition);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7286f5bc2..fc1e71979 100644
index 1523b7d96..6140540cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -235,6 +235,8 @@ import org.bukkit.inventory.InventoryView;
@@ -236,6 +236,8 @@ import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.potion.PotionEffect;
@ -40,7 +40,7 @@ index 7286f5bc2..fc1e71979 100644
public class CraftEventFactory {
public static org.bukkit.block.Block blockDamage; // For use in EntityDamageByBlockEvent
public static Entity entityDamage; // For use in EntityDamageByEntityEvent
@@ -1511,6 +1513,21 @@ public class CraftEventFactory {
@@ -1527,6 +1529,21 @@ public class CraftEventFactory {
return event;
}