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

Update to Minecraft 1.13

Browse source
This commit is contained in:
md_5 2018-07-22 12:00:00 +10:00
parent 3fa6cc486b
commit ed1cec9ae9
150 changed files with 540 additions and 530 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0001-POM-Changes.patch
View file

@ -1,11 +1,11 @@
From 7e450808642481b9b91d86caf7ac86f299cdf862 Mon Sep 17 00:00:00 2001
From 407541257ac25d8a801c49d7164975e0d9a61560 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 08e0c515..a53bb3dd 100644
index 85ae8108..75469885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
@ -16,7 +16,7 @@ index 08e0c515..a53bb3dd 100644
- <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.13-pre7-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Bukkit</name>

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

@ -1,4 +1,4 @@
From cec75be1115b2741ea1a77572dd3222867af17e8 Mon Sep 17 00:00:00 2001
From e509a9dbfc12a6f121e9dcba76b0c012f5faf99a 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

2
Bukkit-Patches/0003-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 1a8095ed9b3e3f7492886a5766626b3df85b8abd Mon Sep 17 00:00:00 2001
From 1dbcb6a2878aa7f8179a87405c83a0c7d000343a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings

2
Bukkit-Patches/0004-Add-PlayerItemDamageEvent.patch
View file

@ -1,4 +1,4 @@
From 2c4aae37e35e940afef4cfee33551f7b69d2912a Mon Sep 17 00:00:00 2001
From fd1dc5a5526c7d812bd29d23950cb53101b41b71 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:31:20 +1100
Subject: [PATCH] Add PlayerItemDamageEvent

2
Bukkit-Patches/0005-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From f49b3b2e2b6361836edd5b737f54c26bd3f43a77 Mon Sep 17 00:00:00 2001
From b88c7edf3af4bcce30821a6763f1ed771efb1833 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

2
Bukkit-Patches/0006-Add-Arrow-API.patch
View file

@ -1,4 +1,4 @@
From 6c70b68ac4ecd10c857c8b4cf463df39f68b726f Mon Sep 17 00:00:00 2001
From 8c8c755384aaff1a380ee2665042164f018b60c2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:08:24 +1000
Subject: [PATCH] Add Arrow API

2
Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From fb339f3f7e453f6fcb5e603051e0bc3df9da6939 Mon Sep 17 00:00:00 2001
From 2df28f4bb265e90c9b4b635dbbcd67bfded5900b Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent

2
Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,4 +1,4 @@
From b68add7dc4b2fc0573c1e218532c87ce30fbb274 Mon Sep 17 00:00:00 2001
From 2da0d0f020bf7354b1c2922b7f9872d9d7b86042 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:53 +1000
Subject: [PATCH] Entity Mount and Dismount Events

2
Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch
View file

@ -1,4 +1,4 @@
From be46952b670349d1065cdbd8511c2197c4e2cb3d Mon Sep 17 00:00:00 2001
From 737ac37f20bff38188574d050a5786ec9ad74df2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 7 Jul 2013 10:32:05 -0400
Subject: [PATCH] InventoryClickEvent getClickedInventory

2
Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch
View file

@ -1,4 +1,4 @@
From a4ba3e6c23a818b6e252cfe2c26352182e3c48a1 Mon Sep 17 00:00:00 2001
From d047f9fdf031167c81048b0aeeec3254d3c587b1 Mon Sep 17 00:00:00 2001
From: Alex Bennett <alex.eugene.bennett@gmail.com>
Date: Thu, 11 Jul 2013 15:31:32 -0500
Subject: [PATCH] Added getAllSessionData() to the Conversation API.

2
Bukkit-Patches/0011-Player-Collision-API.patch
View file

@ -1,4 +1,4 @@
From 82903197c713eb5cd64121289c650c29d1d8fbd0 Mon Sep 17 00:00:00 2001
From 7c31ac3a9c7e22b62640ba98f350192b8a546ad1 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

2
Bukkit-Patches/0012-Expand-Boolean-Prompt-Values.patch
View file

@ -1,4 +1,4 @@
From 1a52e9cc4c86c72ebab80030693ae284d4726f58 Mon Sep 17 00:00:00 2001
From 9f856422064c856d6e5c17d639003829bbb75930 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:42:16 +1000
Subject: [PATCH] Expand Boolean Prompt Values

2
Bukkit-Patches/0013-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,4 +1,4 @@
From 58f5460ca00631a393f39b47f02266d345af4c5e Mon Sep 17 00:00:00 2001
From bb37e5575e08877517d2b3dd4ed395f3de38c709 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:49:36 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability

2
Bukkit-Patches/0014-Add-respawn-API.patch
View file

@ -1,4 +1,4 @@
From b0d88ff023cc694ad33c2e4461992f8ca34d8cf7 Mon Sep 17 00:00:00 2001
From 73ed6eb53fb3a831df4adef1eb449397c470637b 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.

2
Bukkit-Patches/0015-Implement-Locale-Getter-for-Players.patch
View file

@ -1,4 +1,4 @@
From 9ef8cacfe15c2fc4c047c99fe94c6e70bb8f7e4d Mon Sep 17 00:00:00 2001
From fae06377bcd68e5cb900329f03e946a7b2b0fed5 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:10:49 +1100
Subject: [PATCH] Implement Locale Getter for Players

2
Bukkit-Patches/0016-Add-support-for-fetching-hidden-players.patch
View file

@ -1,4 +1,4 @@
From 3c2b4abb1c8df72e3a6e88cf40d70d9dcf8d5a8a Mon Sep 17 00:00:00 2001
From c891bc28532673a8e94ad24630b99f13df21583c 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

2
Bukkit-Patches/0017-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 048c7c79c747fb83d25b376419eb55644dd14dcd Mon Sep 17 00:00:00 2001
From f55070b493b564582e5db9553d2f414e76b1c966 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

4
Bukkit-Patches/0018-Remove-deprecation-on-some-player-lookup-methods.patch
View file

@ -1,4 +1,4 @@
From a709434e09d8f08e0659739802f1ab121b0ef7d8 Mon Sep 17 00:00:00 2001
From fccedcbe94f842d76facf034cd5eee98a3adaa40 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 30 Mar 2014 15:58:22 +1100
Subject: [PATCH] Remove deprecation on some player lookup methods
@ -49,7 +49,7 @@ index 27c69e96..0f42a66a 100644
return server.matchPlayer(name);
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c9ef86e4..65ad9aa0 100644
index 39b4b27c..65641699 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -303,23 +303,17 @@ public interface Server extends PluginMessageRecipient {

2
Bukkit-Patches/0019-Add-PlayerSpawnLocationEvent.patch
View file

@ -1,4 +1,4 @@
From d139d10e754a896afc297fce192f4b7c893f99da Mon Sep 17 00:00:00 2001
From 0b274b75697ee668953cef8fc33a76f36b9a53a0 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:01:32 +0200
Subject: [PATCH] Add PlayerSpawnLocationEvent.

2
Bukkit-Patches/0020-Ease-ClassLoader-Deadlocks-Where-Possible.patch
View file

@ -1,4 +1,4 @@
From c69b90a15fa7fd7e87fb00fbc8b935b3c3988e8a Mon Sep 17 00:00:00 2001
From 8181e3ca8c1a5f47cac15d6bc389d065f2ae9f2b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 16 Jul 2014 17:24:21 +1000
Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible

2
Bukkit-Patches/0021-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,4 +1,4 @@
From f9cf986ee1bdf5c7966e683f9922e2c0fcaf4e15 Mon Sep 17 00:00:00 2001
From 697fa066c39fb97accb325dd610afeb0d49be801 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

2
Bukkit-Patches/0022-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View file

@ -1,4 +1,4 @@
From 9ba610535045a7ff29815a1c73a977f6ee7eecbc Mon Sep 17 00:00:00 2001
From 9413847d3f13aff8cf8b607ca85a2eb280ab744d Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:31:04 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

4
Bukkit-Patches/0023-BungeeCord-Chat-API.patch
View file

@ -1,11 +1,11 @@
From 3b24fd601a982cf6893f914495dbce6a681dcb3f Mon Sep 17 00:00:00 2001
From fe876d095a9b60c1ffb8867ebe461ce634762c9d 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 a53bb3dd..3e6c8707 100644
index 75469885..e946bccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,14 @@

2
Bukkit-Patches/0024-Add-restart-API.patch
View file

@ -1,4 +1,4 @@
From 0df7847f370c251493a65723dc66814079ecbd4a Mon Sep 17 00:00:00 2001
From 7b0e76dfaeb3471c2d8523a57488a6664e5befd5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:10:15 +1000
Subject: [PATCH] Add restart API.

8
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From 3ae76c21e04e28cfe373f1c03772e22091a814fb Mon Sep 17 00:00:00 2001
From a8726a247a29a1435c3206f7918c070b1b4ac62d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index 9d8810cc..958eb763 100644
index 932d51b7b..5d398f7cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -18,7 +18,7 @@ index 9d8810cc..958eb763 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.13-pre7-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@ -99,7 +99,7 @@ index 9d8810cc..958eb763 100644
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index f905d17b..93046379 100644
index f905d17b6..93046379d 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {

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

@ -1,4 +1,4 @@
From 7a855fa4c10eadd25a2e98cd507d7cd9f0afdbdd Mon Sep 17 00:00:00 2001
From c6ee921767b320a3e46279bb4c5118f257371904 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,10 +6,10 @@ 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 df6d227fe..687c29bf7 100644
index c5e1c0374..73e4cb4aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1784,4 +1784,14 @@ public final class CraftServer implements Server {
@@ -1766,4 +1766,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}

82
CraftBukkit-Patches/0003-mc-dev-imports.patch
View file

@ -1,4 +1,4 @@
From 9d7dfd74029263cde1add98520ba205fbd88aba5 Mon Sep 17 00:00:00 2001
From 94b4959e5bb71cb3161a6e2b01230cf3bc24bbeb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports
@ -7,7 +7,7 @@ Imported files which are only modified by Spigot, not upstream. Files here shoul
diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
new file mode 100644
index 00000000..47279ebf
index 000000000..47279ebfd
--- /dev/null
+++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
@@ -0,0 +1,117 @@
@ -130,7 +130,7 @@ index 00000000..47279ebf
+}
diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java
new file mode 100644
index 00000000..957af9b3
index 000000000..957af9b3f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ChunkGenerator.java
@@ -0,0 +1,43 @@
@ -179,7 +179,7 @@ index 00000000..957af9b3
+}
diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
new file mode 100644
index 00000000..a0362c3f
index 000000000..a0362c3f8
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
@@ -0,0 +1,159 @@
@ -344,7 +344,7 @@ index 00000000..a0362c3f
+}
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
new file mode 100644
index 00000000..34a3633a
index 000000000..764dec080
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -0,0 +1,271 @@
@ -398,11 +398,11 @@ index 00000000..34a3633a
+ return SoundEffects.ENTITY_SQUID_HURT;
+ }
+
+ protected SoundEffect cr() {
+ protected SoundEffect cs() {
+ return SoundEffects.ENTITY_SQUID_DEATH;
+ }
+
+ protected float cC() {
+ protected float cD() {
+ return 0.4F;
+ }
+
@ -485,7 +485,7 @@ index 00000000..34a3633a
+
+ public boolean damageEntity(DamageSource damagesource, float f) {
+ if (super.damageEntity(damagesource, f) && this.getLastDamager() != null) {
+ this.dy();
+ this.dz();
+ return true;
+ } else {
+ return false;
@ -499,8 +499,8 @@ index 00000000..34a3633a
+ return vec3d1;
+ }
+
+ private void dy() {
+ this.a(SoundEffects.ENTITY_SQUID_SQUIRT, this.cC(), this.cD());
+ private void dz() {
+ this.a(SoundEffects.ENTITY_SQUID_SQUIRT, this.cD(), this.cE());
+ Vec3D vec3d = this.b(new Vec3D(0.0D, -1.0D, 0.0D)).add(this.locX, this.locY, this.locZ);
+
+ for (int i = 0; i < 30; ++i) {
@ -603,7 +603,7 @@ index 00000000..34a3633a
+ }
+
+ public void e() {
+ int i = this.b.ci();
+ int i = this.b.cj();
+
+ if (i > 100) {
+ this.b.c(0.0F, 0.0F, 0.0F);
@ -621,7 +621,7 @@ index 00000000..34a3633a
+}
diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
new file mode 100644
index 00000000..634d4f72
index 000000000..634d4f721
--- /dev/null
+++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
@@ -0,0 +1,55 @@
@ -682,7 +682,7 @@ index 00000000..634d4f72
+}
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
new file mode 100644
index 00000000..1a7e20d6
index 000000000..1a7e20d6f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
@@ -0,0 +1,120 @@
@ -808,7 +808,7 @@ index 00000000..1a7e20d6
+}
diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
new file mode 100644
index 00000000..f761bb90
index 000000000..f761bb90f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/IChunkLoader.java
@@ -0,0 +1,24 @@
@ -838,7 +838,7 @@ index 00000000..f761bb90
+}
diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
new file mode 100644
index 00000000..345d763d
index 000000000..345d763d9
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
@@ -0,0 +1,89 @@
@ -933,7 +933,7 @@ index 00000000..345d763d
+}
diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
new file mode 100644
index 00000000..6f8d3748
index 000000000..6f8d3748b
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
@@ -0,0 +1,123 @@
@ -1062,7 +1062,7 @@ index 00000000..6f8d3748
+}
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
new file mode 100644
index 00000000..1022c00b
index 000000000..1022c00be
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
@@ -0,0 +1,137 @@
@ -1205,7 +1205,7 @@ index 00000000..1022c00b
+}
diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
new file mode 100644
index 00000000..1509c772
index 000000000..1509c772e
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NibbleArray.java
@@ -0,0 +1,58 @@
@ -1269,7 +1269,7 @@ index 00000000..1509c772
+}
diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
new file mode 100644
index 00000000..47b871df
index 000000000..47b871dfc
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
@@ -0,0 +1,39 @@
@ -1314,7 +1314,7 @@ index 00000000..47b871df
+}
diff --git a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
new file mode 100644
index 00000000..bc93677f
index 000000000..bc93677fa
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
@@ -0,0 +1,30 @@
@ -1350,7 +1350,7 @@ index 00000000..bc93677f
+}
diff --git a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
new file mode 100644
index 00000000..06f3954b
index 000000000..06f3954b0
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
@@ -0,0 +1,30 @@
@ -1386,7 +1386,7 @@ index 00000000..06f3954b
+}
diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java
new file mode 100644
index 00000000..cfea4d54
index 000000000..cfea4d549
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java
@@ -0,0 +1,34 @@
@ -1426,7 +1426,7 @@ index 00000000..cfea4d54
+}
diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
new file mode 100644
index 00000000..3c5f8151
index 000000000..3c5f81519
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
@@ -0,0 +1,61 @@
@ -1493,7 +1493,7 @@ index 00000000..3c5f8151
+}
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
new file mode 100644
index 00000000..e55384e7
index 000000000..e55384e70
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
@@ -0,0 +1,46 @@
@ -1545,7 +1545,7 @@ index 00000000..e55384e7
+}
diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
new file mode 100644
index 00000000..54550602
index 000000000..855192af3
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PersistentCollection.java
@@ -0,0 +1,201 @@
@ -1599,7 +1599,7 @@ index 00000000..54550602
+
+ if (file != null && file.exists()) {
+ persistentbase = (PersistentBase) function.apply(s);
+ persistentbase.a(this.a(s, 1513).getCompound("data"));
+ persistentbase.a(this.a(s, 1519).getCompound("data"));
+ this.a.put(s, persistentbase);
+ this.d.add(persistentbase);
+ }
@ -1674,7 +1674,7 @@ index 00000000..54550602
+ NBTTagCompound nbttagcompound = new NBTTagCompound();
+
+ nbttagcompound.set("data", persistentbase.b(new NBTTagCompound()));
+ nbttagcompound.setInt("DataVersion", 1513);
+ nbttagcompound.setInt("DataVersion", 1519);
+ FileOutputStream fileoutputstream = new FileOutputStream(file);
+
+ NBTCompressedStreamTools.a(nbttagcompound, (OutputStream) fileoutputstream);
@ -1752,7 +1752,7 @@ index 00000000..54550602
+}
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
new file mode 100644
index 00000000..d62670ac
index 000000000..d62670ac5
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -0,0 +1,144 @@
@ -1902,7 +1902,7 @@ index 00000000..d62670ac
+}
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
new file mode 100644
index 00000000..3215f9dd
index 000000000..38ff3b662
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -0,0 +1,229 @@
@ -2105,7 +2105,7 @@ index 00000000..3215f9dd
+ JsonObject jsonobject1 = new JsonObject();
+
+ jsonobject1.add("stats", jsonobject);
+ jsonobject1.addProperty("DataVersion", Integer.valueOf(1513));
+ jsonobject1.addProperty("DataVersion", Integer.valueOf(1519));
+ return jsonobject1.toString();
+ }
+
@ -2137,7 +2137,7 @@ index 00000000..3215f9dd
+}
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
new file mode 100644
index 00000000..263ea953
index 000000000..263ea953a
--- /dev/null
+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -0,0 +1,240 @@
@ -2383,7 +2383,7 @@ index 00000000..263ea953
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
new file mode 100644
index 00000000..fb5ac05d
index 000000000..fb5ac05d5
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
@@ -0,0 +1,37 @@
@ -2426,7 +2426,7 @@ index 00000000..fb5ac05d
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
new file mode 100644
index 00000000..e6cc8f01
index 000000000..e6cc8f011
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
@@ -0,0 +1,42 @@
@ -2474,7 +2474,7 @@ index 00000000..e6cc8f01
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
new file mode 100644
index 00000000..9d564488
index 000000000..9d564488e
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
@@ -0,0 +1,37 @@
@ -2517,7 +2517,7 @@ index 00000000..9d564488
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
new file mode 100644
index 00000000..3d8e08ff
index 000000000..3d8e08ff5
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
@@ -0,0 +1,59 @@
@ -2582,7 +2582,7 @@ index 00000000..3d8e08ff
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
new file mode 100644
index 00000000..6acbccb0
index 000000000..6acbccb0f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
@@ -0,0 +1,56 @@
@ -2644,7 +2644,7 @@ index 00000000..6acbccb0
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
new file mode 100644
index 00000000..a50a45c4
index 000000000..a50a45c43
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
@@ -0,0 +1,47 @@
@ -2697,7 +2697,7 @@ index 00000000..a50a45c4
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
new file mode 100644
index 00000000..887293c3
index 000000000..887293c3c
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
@@ -0,0 +1,58 @@
@ -2761,7 +2761,7 @@ index 00000000..887293c3
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenMonument.java b/src/main/java/net/minecraft/server/WorldGenMonument.java
new file mode 100644
index 00000000..57afb480
index 000000000..57afb4809
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenMonument.java
@@ -0,0 +1,159 @@
@ -2926,7 +2926,7 @@ index 00000000..57afb480
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenVillage.java b/src/main/java/net/minecraft/server/WorldGenVillage.java
new file mode 100644
index 00000000..c9ac6ca8
index 000000000..c9ac6ca80
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenVillage.java
@@ -0,0 +1,121 @@
@ -3053,7 +3053,7 @@ index 00000000..c9ac6ca8
+}
diff --git a/src/main/java/org/spigotmc/SneakyThrow.java b/src/main/java/org/spigotmc/SneakyThrow.java
new file mode 100644
index 00000000..31fc0a98
index 000000000..31fc0a984
--- /dev/null
+++ b/src/main/java/org/spigotmc/SneakyThrow.java
@@ -0,0 +1,15 @@

18
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From ea038be68c052b9d412b0ddbbeae9fae56918047 Mon Sep 17 00:00:00 2001
From 7f5e1cdcbdba8f6877b3edbb1e3276802167cae9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration
Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index b6a35ade..fe05229e 100644
index 2d6154bd3..b8a4b0bdd 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -177,6 +177,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -31,7 +31,7 @@ index b6a35ade..fe05229e 100644
server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9a8071ac..5b5369da 100644
index 000992db7..28cb33095 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -99,6 +99,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -51,7 +51,7 @@ index 9a8071ac..5b5369da 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 687c29bf..ea56af0f 100644
index 73e4cb4aa..6804b84fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -722,6 +722,7 @@ public final class CraftServer implements Server {
@ -78,10 +78,10 @@ index 687c29bf..ea56af0f 100644
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e8bf55e8..c234b874 100644
index 3fecc796f..df07dc594 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -118,6 +118,14 @@ public class Main {
@@ -120,6 +120,14 @@ public class Main {
acceptsAll(asList("v", "version"), "Show the CraftBukkit Version");
acceptsAll(asList("demo"), "Demo mode");
@ -98,7 +98,7 @@ index e8bf55e8..c234b874 100644
diff --git a/src/main/java/org/spigotmc/SpigotCommand.java b/src/main/java/org/spigotmc/SpigotCommand.java
new file mode 100644
index 00000000..fdb030c7
index 000000000..fdb030c7a
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotCommand.java
@@ -0,0 +1,44 @@
@ -148,7 +148,7 @@ index 00000000..fdb030c7
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
index 00000000..132ab78c
index 000000000..132ab78ce
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +1,140 @@
@ -294,7 +294,7 @@ index 00000000..132ab78c
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
new file mode 100644
index 00000000..961ddb42
index 000000000..961ddb428
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -0,0 +1,71 @@

28
CraftBukkit-Patches/0005-Crop-Growth-Rates.patch
View file

@ -1,4 +1,4 @@
From c8e51c1faab2e588b7c693c9ab9b482421230d79 Mon Sep 17 00:00:00 2001
From 4d520f0825124b2dee507cd30b6eddcd4bae0984 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 7 Mar 2016 22:14:13 +1100
Subject: [PATCH] Crop Growth Rates
@ -6,10 +6,10 @@ Subject: [PATCH] Crop Growth Rates
Allows configuring the growth rates of crops as a percentage of their normal growth rate.
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index bafd8432..139b40f1 100644
index cc272c68d..95d6174e8 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -1401,6 +1401,18 @@ public class Block implements IMaterial {
@@ -1427,6 +1427,18 @@ public class Block implements IMaterial {
a(new MinecraftKey(s), block);
}
@ -29,7 +29,7 @@ index bafd8432..139b40f1 100644
NONE, XZ, XYZ;
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index f5cef227..54685157 100644
index f5cef2276..54685157f 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -32,7 +32,7 @@ public class BlockCactus extends Block {
@ -42,7 +42,7 @@ index f5cef227..54685157 100644
IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
diff --git a/src/main/java/net/minecraft/server/BlockCocoa.java b/src/main/java/net/minecraft/server/BlockCocoa.java
index b4ba8b56..e2c8b90b 100644
index 95303b97f..a343d8acb 100644
--- a/src/main/java/net/minecraft/server/BlockCocoa.java
+++ b/src/main/java/net/minecraft/server/BlockCocoa.java
@@ -19,7 +19,7 @@ public class BlockCocoa extends BlockFacingHorizontal implements IBlockFragilePl
@ -55,11 +55,11 @@ index b4ba8b56..e2c8b90b 100644
if (i < 2) {
diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
index 11136873..e64b6dbd 100644
index faa5a5190..b392846aa 100644
--- a/src/main/java/net/minecraft/server/BlockCrops.java
+++ b/src/main/java/net/minecraft/server/BlockCrops.java
@@ -50,7 +50,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
if (i < this.d()) {
if (i < this.e()) {
float f = a((Block) this, (IBlockAccess) world, blockposition);
- if (random.nextInt((int) (25.0F / f) + 1) == 0) {
@ -68,7 +68,7 @@ index 11136873..e64b6dbd 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
index 0dd2122d..cc063ad3 100644
index ea2d9f4d0..56d290caa 100644
--- a/src/main/java/net/minecraft/server/BlockMushroom.java
+++ b/src/main/java/net/minecraft/server/BlockMushroom.java
@@ -21,7 +21,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme
@ -81,7 +81,7 @@ index 0dd2122d..cc063ad3 100644
boolean flag = true;
Iterator iterator = BlockPosition.b(blockposition.a(-4, -1, -4), blockposition.a(4, 1, 4)).iterator();
diff --git a/src/main/java/net/minecraft/server/BlockNetherWart.java b/src/main/java/net/minecraft/server/BlockNetherWart.java
index 46092357..f3f47a81 100644
index 460923578..f3f47a81c 100644
--- a/src/main/java/net/minecraft/server/BlockNetherWart.java
+++ b/src/main/java/net/minecraft/server/BlockNetherWart.java
@@ -23,7 +23,7 @@ public class BlockNetherWart extends BlockPlant {
@ -94,7 +94,7 @@ index 46092357..f3f47a81 100644
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, blockposition, iblockdata, 2); // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
index 6fcd81ce..313821d5 100644
index 6fcd81ce5..313821d52 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -28,7 +28,7 @@ public class BlockReed extends Block {
@ -107,7 +107,7 @@ index 6fcd81ce..313821d5 100644
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4);
} else {
diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
index 8b2e5f57..723e5c9b 100644
index 8b2e5f577..723e5c9b4 100644
--- a/src/main/java/net/minecraft/server/BlockSapling.java
+++ b/src/main/java/net/minecraft/server/BlockSapling.java
@@ -30,7 +30,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@ -120,7 +120,7 @@ index 8b2e5f57..723e5c9b 100644
world.captureTreeGeneration = true;
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
index 61b44b50..3959e070 100644
index fd7ecbbd7..0192f9386 100644
--- a/src/main/java/net/minecraft/server/BlockStem.java
+++ b/src/main/java/net/minecraft/server/BlockStem.java
@@ -30,7 +30,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@ -133,7 +133,7 @@ index 61b44b50..3959e070 100644
if (i < 7) {
diff --git a/src/main/java/net/minecraft/server/BlockVine.java b/src/main/java/net/minecraft/server/BlockVine.java
index 58b20b7e..704acd9f 100644
index e63b1356a..daf5d8d7a 100644
--- a/src/main/java/net/minecraft/server/BlockVine.java
+++ b/src/main/java/net/minecraft/server/BlockVine.java
@@ -166,7 +166,7 @@ public class BlockVine extends Block {
@ -146,7 +146,7 @@ index 58b20b7e..704acd9f 100644
BlockPosition blockposition1 = blockposition.up();
BlockPosition blockposition2;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 961ddb42..c62fa456 100644
index 961ddb428..c62fa4569 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -68,4 +68,41 @@ public class SpigotWorldConfig

8
CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From b3c2aecb3b28a8ea87c344983626a97312d7d0a9 Mon Sep 17 00:00:00 2001
From 7258a9a81704a9011d3598d084bcf94eb0a932db 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/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 13a0ed12..9a20b640 100644
index 13a0ed127..9a20b640d 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -149,7 +149,10 @@ public class EntityItem extends Entity {
@ -43,7 +43,7 @@ index 13a0ed12..9a20b640 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5b5369da..539e5a5f 100644
index 28cb33095..457e868d8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -864,6 +864,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -71,7 +71,7 @@ index 5b5369da..539e5a5f 100644
if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index c62fa456..23730154 100644
index c62fa4569..23730154d 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -105,4 +105,18 @@ public class SpigotWorldConfig

16
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From ab5a0b76a92bc8f5e8c053bdead5a8a43c92cc44 Mon Sep 17 00:00:00 2001
From ad3abfbdc0f3615e7b996d95ac7963f2fcdc460b 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,10 +6,10 @@ 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/Block.java b/src/main/java/net/minecraft/server/Block.java
index 139b40f17..ffb91b27b 100644
index 95d6174e8..06f10e1e8 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -396,10 +396,14 @@ public class Block implements IMaterial {
@@ -395,10 +395,14 @@ public class Block implements IMaterial {
}
@Deprecated
@ -27,7 +27,7 @@ index 139b40f17..ffb91b27b 100644
public int a(IBlockData iblockdata, Random random) {
return 1;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dc0bc803c..6fa6900a0 100644
index 549fa2105..caccb1a15 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -725,6 +725,7 @@ public abstract class EntityLiving extends Entity {
@ -59,7 +59,7 @@ index 14fab2b31..ef5817933 100644
EntityPlayer entityplayer = (EntityPlayer) entity;
Iterator iterator = this.c.iterator();
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 3cd0b0a9f..0410f9cf3 100644
index 0a59da7d5..6e940b640 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -324,6 +324,7 @@ public class EntityTrackerEntry {
@ -79,7 +79,7 @@ index 3cd0b0a9f..0410f9cf3 100644
this.trackedPlayers.remove(entityplayer);
this.tracker.c(entityplayer);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 539e5a5fe..b88c35c8e 100644
index 457e868d8..882fa397f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -840,6 +840,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -106,7 +106,7 @@ index 539e5a5fe..b88c35c8e 100644
entity.b(false);
entity.die();
if (entity instanceof EntityHuman) {
@@ -2153,6 +2156,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -2157,6 +2160,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
public void a(Collection<Entity> collection) {
@ -115,7 +115,7 @@ index 539e5a5fe..b88c35c8e 100644
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ea56af0f4..b8705cc7b 100644
index 6804b84fa..099bc9e34 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -668,6 +668,7 @@ public final class CraftServer implements Server {

8
CraftBukkit-Patches/0008-View-Distance.patch
View file

@ -1,4 +1,4 @@
From abe92e401dcc40f0d3385068e234cc54638eb8a0 Mon Sep 17 00:00:00 2001
From 70e6582e1ad41d97b0a96d515d770cbd2bb46542 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, and view distances below 3. Be wary of the issues selecting a view distance of 1 or 2 may cause!
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index ef581793..4ecdeef2 100644
index ef5817933..4ecdeef23 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -18,7 +18,7 @@ public class EntityTracker {
@ -19,7 +19,7 @@ index ef581793..4ecdeef2 100644
public static long a(double d0) {
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 551236c9..d7c299a4 100644
index 551236c95..d7c299a41 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -42,7 +42,7 @@ public class PlayerChunkMap {
@ -32,7 +32,7 @@ index 551236c9..d7c299a4 100644
public WorldServer getWorld() {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 23730154..f5096e3a 100644
index 23730154d..f5096e3a4 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -119,4 +119,11 @@ public class SpigotWorldConfig

64
CraftBukkit-Patches/0009-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From cb66502df093503f966530e88032675ff725026f Mon Sep 17 00:00:00 2001
From 638ccd1e6396da6b58cc60744a760a1711417f8e 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
@ -24,7 +24,7 @@ index 684fa0753..3e719d5cd 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 63a1823ac..d95c87fd7 100644
index 0989ebd88..6a99c9928 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -120,7 +120,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -37,7 +37,7 @@ index 63a1823ac..d95c87fd7 100644
if (data != null) {
Chunk chunk = (Chunk) data[0];
NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
@@ -651,6 +653,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -653,6 +655,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
public void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) {
NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
World world = chunk.getWorld();
@ -45,7 +45,7 @@ index 63a1823ac..d95c87fd7 100644
for (int i = 0; i < nbttaglist.size(); ++i) {
NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
@@ -659,6 +662,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -661,6 +664,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
chunk.f(true);
}
@ -54,7 +54,7 @@ index 63a1823ac..d95c87fd7 100644
NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10);
for (int j = 0; j < nbttaglist1.size(); ++j) {
@@ -675,6 +680,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -677,6 +682,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -63,7 +63,7 @@ index 63a1823ac..d95c87fd7 100644
if (nbttagcompound.hasKeyOfType("TileTicks", 9) && world.I() instanceof TickListServer) {
((TickListServer) world.I()).a(nbttagcompound.getList("TileTicks", 10));
@@ -683,6 +690,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -685,6 +692,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
if (nbttagcompound.hasKeyOfType("LiquidTicks", 9) && world.H() instanceof TickListServer) {
((TickListServer) world.H()).a(nbttagcompound.getList("LiquidTicks", 10));
}
@ -72,7 +72,7 @@ index 63a1823ac..d95c87fd7 100644
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index fe05229e1..427668ec1 100644
index b8a4b0bdd..dbd74d384 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -29,6 +29,7 @@ import org.apache.logging.log4j.Level;
@ -100,7 +100,7 @@ index fe05229e1..427668ec1 100644
public boolean S() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2a84d5de4..f347d2aa7 100644
index 015c6ab69..e7f989686 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -29,6 +29,7 @@ import org.bukkit.command.CommandSender;
@ -136,7 +136,7 @@ index 2a84d5de4..f347d2aa7 100644
protected float ab() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6fa6900a0..7d688f287 100644
index caccb1a15..6f8572573 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -32,6 +32,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -154,7 +154,7 @@ index 6fa6900a0..7d688f287 100644
public void tick() {
+ SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot
super.tick();
this.cU();
this.cV();
this.o();
@@ -2048,7 +2051,9 @@ public abstract class EntityLiving extends Entity {
}
@ -205,13 +205,13 @@ index 6fa6900a0..7d688f287 100644
}
+ SpigotTimings.timerEntityAICollision.startTiming(); // Spigot
this.cM();
this.cN();
+ SpigotTimings.timerEntityAICollision.stopTiming(); // Spigot
this.world.methodProfiler.e();
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7dacad688..d000f5bf6 100644
index 55022c848..de497fa50 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -62,6 +62,7 @@ import org.bukkit.Bukkit;
@ -222,7 +222,7 @@ index 7dacad688..d000f5bf6 100644
public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStatistics, ICommandListener, Runnable {
@@ -729,6 +730,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -768,6 +769,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
public void u() {}
protected void v() {
@ -230,7 +230,7 @@ index 7dacad688..d000f5bf6 100644
long i = SystemUtils.c();
++this.ticks;
@@ -754,10 +756,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -793,10 +795,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@ -243,8 +243,8 @@ index 7dacad688..d000f5bf6 100644
}
this.methodProfiler.a("snooper");
@@ -776,10 +780,14 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.ao = this.ao * 0.8F + (float) l / 1000000.0F * 0.19999999F;
@@ -815,10 +819,14 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.ap = this.ap * 0.8F + (float) l / 1000000.0F * 0.19999999F;
this.methodProfiler.e();
this.methodProfiler.e();
+ SpigotTimings.serverTickTimer.stopTiming(); // Spigot
@ -258,12 +258,12 @@ index 7dacad688..d000f5bf6 100644
this.methodProfiler.a("jobs");
FutureTask futuretask;
@@ -789,17 +797,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -828,17 +836,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
this.methodProfiler.c("commandFunctions");
+ SpigotTimings.commandFunctionsTimer.startTiming(); // Spigot
this.aD().X_();
this.getFunctionData().Y_();
+ SpigotTimings.commandFunctionsTimer.stopTiming(); // Spigot
this.methodProfiler.c("levels");
@ -283,7 +283,7 @@ index 7dacad688..d000f5bf6 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
@@ -807,6 +822,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -846,6 +861,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
}
}
@ -291,7 +291,7 @@ index 7dacad688..d000f5bf6 100644
int i;
@@ -832,7 +848,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -871,7 +887,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
CrashReport crashreport;
try {
@ -301,7 +301,7 @@ index 7dacad688..d000f5bf6 100644
} catch (Throwable throwable) {
crashreport = CrashReport.a(throwable, "Exception ticking world");
worldserver.a(crashreport);
@@ -840,7 +858,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -879,7 +897,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
try {
@ -311,7 +311,7 @@ index 7dacad688..d000f5bf6 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
worldserver.a(crashreport);
@@ -849,7 +869,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -888,7 +908,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.methodProfiler.e();
this.methodProfiler.a("tracker");
@ -321,7 +321,7 @@ index 7dacad688..d000f5bf6 100644
this.methodProfiler.e();
this.methodProfiler.e();
}
@@ -858,14 +880,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -897,14 +919,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
this.methodProfiler.c("connection");
@ -336,14 +336,14 @@ index 7dacad688..d000f5bf6 100644
+ SpigotTimings.tickablesTimer.startTiming(); // Spigot
for (i = 0; i < this.l.size(); ++i) {
((ITickable) this.l.get(i)).X_();
((ITickable) this.l.get(i)).Y_();
}
+ SpigotTimings.tickablesTimer.stopTiming(); // Spigot
this.methodProfiler.e();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 500ebb245..0d723548a 100644
index 94a4cc7f1..66420735c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -372,7 +372,7 @@ index 500ebb245..0d723548a 100644
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index b121440de..4fec7740b 100644
index cde437933..331029284 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,10 +4,12 @@ import javax.annotation.Nullable;
@ -389,7 +389,7 @@ index b121440de..4fec7740b 100644
private final TileEntityTypes<?> e;
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b88c35c8e..f9d991515 100644
index 882fa397f..2a13b29f4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -20,6 +20,7 @@ import com.google.common.collect.Maps;
@ -450,7 +450,7 @@ index b88c35c8e..f9d991515 100644
return String.valueOf(TileEntityTypes.a(tileentity.C()));
});
+ tileentity.tickTimer.startTiming(); // Spigot
((ITickable) tileentity).X_();
((ITickable) tileentity).Y_();
this.methodProfiler.e();
} catch (Throwable throwable2) {
@@ -1133,6 +1143,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -490,7 +490,7 @@ index b88c35c8e..f9d991515 100644
entity.N = entity.locX;
entity.O = entity.locY;
entity.P = entity.locZ;
@@ -1297,6 +1316,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1301,6 +1320,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
}
}
@ -499,7 +499,7 @@ index b88c35c8e..f9d991515 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d1429e418..f2631523a 100644
index a9a257b95..4d5bede24 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -274,11 +274,14 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -556,10 +556,10 @@ index d1429e418..f2631523a 100644
public boolean j_() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b8705cc7b..259712fcf 100644
index 099bc9e34..b53223db1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1792,6 +1792,11 @@ public final class CraftServer implements Server {
@@ -1774,6 +1774,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 145ec3a3f38c8893758b0748f548295dbbe89667 Mon Sep 17 00:00:00 2001
From 57f02a5f69eb4b3257901cf2b67e1bbcefc3dea6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -8,7 +8,7 @@ Changes the mob spawning algorithm to properly account for view distance and the
Needs better documentation.
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 27a02c0a..44fb75c6 100644
index da3229cec..e54dcaa99 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -42,10 +42,15 @@ public final class SpawnerCreature {
@ -32,7 +32,7 @@ index 27a02c0a..44fb75c6 100644
// CraftBukkit start - use LongHash and LongHashSet
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index f5096e3a..3dee3ff5 100644
index f5096e3a4..3dee3ff5e 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -126,4 +126,11 @@ public class SpigotWorldConfig

4
CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch
View file

@ -1,11 +1,11 @@
From 073ba959b655d4de3084e5596ac403342538c2cf Mon Sep 17 00:00:00 2001
From cedc15f61f7a77c75d8c64c7eec343d8ee2078b1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f9d99151..4c89cb2c 100644
index 2a13b29f4..7367dac45 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1125,6 +1125,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

6
CraftBukkit-Patches/0012-Item-Despawn-Rate.patch
View file

@ -1,11 +1,11 @@
From 03cdbd6e71dc6e77e5dcd006b0bdf426e0050650 Mon Sep 17 00:00:00 2001
From 2ab9f497a835e3c4592e494e4a220bb8976879da Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 9a20b640..0ac47b58 100644
index 9a20b640d..0ac47b585 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -126,7 +126,7 @@ public class EntityItem extends Entity {
@ -26,7 +26,7 @@ index 9a20b640..0ac47b58 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3dee3ff5..6a8b5cd3 100644
index 3dee3ff5e..6a8b5cd32 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -133,4 +133,11 @@ public class SpigotWorldConfig

12
CraftBukkit-Patches/0013-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From a1306e150ab046d5ee45ce927ca127e0c7a48e2f Mon Sep 17 00:00:00 2001
From 0172a99e6dbe322c05ee0b184e3675f77f3276ce Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f347d2aa7..1d272a6a1 100644
index e7f989686..855f7ff0a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -159,6 +159,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -98,7 +98,7 @@ index b693c3033..1e5029170 100644
super(entitytypes, world);
this.tileX = -1;
diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
index ff9eee403..4c2cdd4bc 100644
index da878c760..6e2592e96 100644
--- a/src/main/java/net/minecraft/server/EntityFireworks.java
+++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -17,6 +17,14 @@ public class EntityFireworks extends Entity {
@ -150,7 +150,7 @@ index 0ac47b585..4af09f5cd 100644
if (this.motY < 0.05999999865889549D) {
this.motY += 5.000000237487257E-4D;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3e762d619..3c1adeea6 100644
index 6f8572573..514c95151 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -128,6 +128,13 @@ public abstract class EntityLiving extends Entity {
@ -168,7 +168,7 @@ index 3e762d619..3c1adeea6 100644
protected EntityLiving(EntityTypes<?> entitytypes, World world) {
super(entitytypes, world);
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 593b55eef..6c66f7deb 100644
index aacb270fc..32893a32c 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -98,6 +98,22 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -195,7 +195,7 @@ index 593b55eef..6c66f7deb 100644
if (--this.profession <= 0) {
BlockPosition blockposition = new BlockPosition(this);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4c89cb2c2..6207a4cd0 100644
index 7367dac45..ce5fa30b2 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1065,6 +1065,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

8
CraftBukkit-Patches/0014-Metrics.patch
View file

@ -1,4 +1,4 @@
From ff374e0935ac4187ef2294aeeb1584593c3760f2 Mon Sep 17 00:00:00 2001
From 6242401a1100fd5a8f885a820c9759d399358637 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics
@ -6,7 +6,7 @@ Subject: [PATCH] Metrics
diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java
new file mode 100644
index 00000000..a5fd59d5
index 000000000..e7d5e8ab6
--- /dev/null
+++ b/src/main/java/org/spigotmc/Metrics.java
@@ -0,0 +1,645 @@
@ -86,7 +86,7 @@ index 00000000..a5fd59d5
+ /**
+ * The base url of the metrics domain
+ */
+ private static final String BASE_URL = "http://mcstats.org";
+ private static final String BASE_URL = "https://mcstats.spigotmc.org";
+ /**
+ * The url used to report a server's status
+ */
@ -656,7 +656,7 @@ index 00000000..a5fd59d5
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 132ab78c..dd02aefc 100644
index 132ab78ce..dd02aefc7 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -36,6 +36,7 @@ public class SpigotConfig

2
CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch
View file

@ -1,4 +1,4 @@
From 320471f1eb4a8a80d4c1f6be7a4bdabe7f04184a Mon Sep 17 00:00:00 2001
From 2925c88ed26107938b8321c8e6b29ba3fc3a49fb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent

8
CraftBukkit-Patches/0016-Entity-Tracking-Ranges.patch
View file

@ -1,4 +1,4 @@
From 933d7d5cbd8d876f7118da1fa90c123f210bc1a1 Mon Sep 17 00:00:00 2001
From e42d759ca82b9562428380f2e1f3f3da6731896b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges
@ -12,7 +12,7 @@ This has multiple benefits:
4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 4ecdeef2..ae31935c 100644
index 4ecdeef23..ae31935c4 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -104,8 +104,9 @@ public class EntityTracker {
@ -27,7 +27,7 @@ index 4ecdeef2..ae31935c 100644
if (this.trackedEntities.b(entity.getId())) {
throw new IllegalStateException("Entity is already tracked!");
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 1d7544ee..b2393688 100644
index 1d7544ee7..b23936889 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -153,4 +153,19 @@ public class SpigotWorldConfig
@ -52,7 +52,7 @@ index 1d7544ee..b2393688 100644
}
diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
new file mode 100644
index 00000000..4bf4d2ac
index 000000000..4bf4d2ac6
--- /dev/null
+++ b/src/main/java/org/spigotmc/TrackingRange.java
@@ -0,0 +1,51 @@

4
CraftBukkit-Patches/0017-Thread-Naming-and-Tweaks.patch
View file

@ -1,4 +1,4 @@
From f885d18f7b0714d872554f450eebe0f61750ae01 Mon Sep 17 00:00:00 2001
From de09d3b287fc28c6ea19d389748a0777e5817ef9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:50:27 +1000
Subject: [PATCH] Thread Naming and Tweaks
@ -6,7 +6,7 @@ Subject: [PATCH] Thread Naming and Tweaks
Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 24ebc91d..f11bd754 100644
index 24ebc91da..f11bd7545 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -79,7 +79,7 @@ public class CraftScheduler implements BukkitScheduler {

8
CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch
View file

@ -1,11 +1,11 @@
From 46f3801536e6de2150414265d687446c9469118f Mon Sep 17 00:00:00 2001
From 467c44744486c51d5a2758bd73bc6b4afc1dbe00 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 2c59f17f..d394645a 100644
index 7ef75de20..0e91aeec3 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -11,7 +11,7 @@ import javax.annotation.Nullable;
@ -18,10 +18,10 @@ index 2c59f17f..d394645a 100644
public static synchronized RegionFile a(File file, int i, int j) {
File file1 = new File(file, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 259712fc..01ee1917 100644
index b53223db1..52465acea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1021,6 +1021,31 @@ public final class CraftServer implements Server {
@@ -1003,6 +1003,31 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
console.worlds.remove(console.worlds.indexOf(handle));

4
CraftBukkit-Patches/0019-Remove-o-Option.patch
View file

@ -1,4 +1,4 @@
From 7e8cadf6c406266c325f5117afa91b2587b3378f Mon Sep 17 00:00:00 2001
From ba07f51e475982bb1b587ce1152cea4910b8b3e1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option
@ -6,7 +6,7 @@ Subject: [PATCH] Remove -o Option
Serves no purpose other than to confuse users.
diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
index 822ee8a9..5055a4fb 100644
index 822ee8a98..5055a4fb8 100644
--- a/src/main/java/net/minecraft/server/PropertyManager.java
+++ b/src/main/java/net/minecraft/server/PropertyManager.java
@@ -54,7 +54,7 @@ public class PropertyManager {

4
CraftBukkit-Patches/0020-Implement-Arrow-API.patch
View file

@ -1,11 +1,11 @@
From a2c1c3a8a02e7b42a8534f89e3cf7790011e97bf Mon Sep 17 00:00:00 2001
From 47f104ba7fb5e1e89a525310db0e08ab454ac177 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index 11ad076e..cc6e22a7 100644
index 11ad076e1..cc6e22a7c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -90,6 +90,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {

6
CraftBukkit-Patches/0021-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 6a6a4aa7124fdc375bae2b217a59c2e0f453b93d Mon Sep 17 00:00:00 2001
From b33f8ab466abe47e79a3601c35bf5ac9f55d8baa Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations
@ -6,7 +6,7 @@ Subject: [PATCH] Hopper Customisations
Allows editing hopper cooldowns and amount transferred per tick.
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 33e24982..8af2d301 100644
index 4339d74c3..d0d271475 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -115,9 +115,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -107,7 +107,7 @@ index 33e24982..8af2d301 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index b2393688..cc173cb3 100644
index b23936889..cc173cb3e 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -168,4 +168,20 @@ public class SpigotWorldConfig

4
CraftBukkit-Patches/0022-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,11 +1,11 @@
From 2fdc9b51ed707545bfa831a742f8671fd2899c35 Mon Sep 17 00:00:00 2001
From 56cb7e430ebcaa730d606fbf0868a7a55d50c92c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0d723548a..d6dddfa5c 100644
index 66420735c..b32d4c755 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1561,6 +1561,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

6
CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From 91dfb21763f8da57c53d4a765395913f41932950 Mon Sep 17 00:00:00 2001
From 9ce4bd9551226b42402e7fdc7dcc9f29471c62cb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -25,10 +25,10 @@ index 8c7c8a043..c9eadd560 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 72cc19866..f09b9902b 100644
index 52465acea..8912d91c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1611,6 +1611,13 @@ public final class CraftServer implements Server {
@@ -1593,6 +1593,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {

22
CraftBukkit-Patches/0024-Configurable-Messages.patch
View file

@ -1,29 +1,29 @@
From ea83668bfd97e9d6afe998ae05c6eb95cb15ffea Mon Sep 17 00:00:00 2001
From 516f840fd039147e63c221e2184912ba776c3ccf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index fe3f37de..f21450c6 100644
index f579f105b..387d8a09f 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.c() > 389) {
- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_server", new Object[] { "1.13-pre7"});
+ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.13-pre7" ) ); // Spigot
if (packethandshakinginsetprotocol.c() > 393) {
- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_server", new Object[] { "1.13"});
+ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.13" ) ); // Spigot
this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage));
this.b.close(chatmessage);
} else if (packethandshakinginsetprotocol.c() < 389) {
- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_client", new Object[] { "1.13-pre7"});
+ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.13-pre7" ) ); // Spigot
} else if (packethandshakinginsetprotocol.c() < 393) {
- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_client", new Object[] { "1.13"});
+ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.13" ) ); // Spigot
this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage));
this.b.close(chatmessage);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 77af1442..80ac1481 100644
index 2d70ab313..c77d04acd 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -493,7 +493,7 @@ public abstract class PlayerList {
@ -45,7 +45,7 @@ index 77af1442..80ac1481 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 133e833c..44341e2c 100644
index 8912d91c0..509cb8181 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -674,11 +674,11 @@ public final class CraftServer implements Server {
@ -65,7 +65,7 @@ index 133e833c..44341e2c 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e53e8013..cec3c4b2 100644
index e53e8013d..cec3c4b24 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -12,6 +12,7 @@ import java.util.Map;

6
CraftBukkit-Patches/0025-Allow-Disabling-of-Random-Lighting-Updates.patch
View file

@ -1,11 +1,11 @@
From ebe32b34ed8433b4a345d2b942613be22d52c730 Mon Sep 17 00:00:00 2001
From bcedb8e5809918df0b048317e59d13528efbe4b1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ce895c67..0da706b5 100644
index 4d5bede24..bd949a1ec 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -446,7 +446,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -18,7 +18,7 @@ index ce895c67..0da706b5 100644
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
int j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index cc173cb3..07a883f1 100644
index cc173cb3e..07a883f19 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -184,4 +184,11 @@ public class SpigotWorldConfig

4
CraftBukkit-Patches/0026-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From 60af6767a2bcbbceb834759c92771e26901cdbb4 Mon Sep 17 00:00:00 2001
From afc7d64ef2ca1466092c7244a814ba493019bf44 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories
@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 9a9181be..3f1dce9d 100644
index bc9bf0041..7f18563e7 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -783,6 +783,18 @@ public class Chunk implements IChunkAccess {

4
CraftBukkit-Patches/0027-Disallow-Interaction-With-Self.patch
View file

@ -1,11 +1,11 @@
From 051dca62ad1b66a8942f5e222b2afa048427188f Mon Sep 17 00:00:00 2001
From 2a25da41d8fdf80013d67fc6c409abe2d92e0d99 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d6dddfa5c..5b3abc563 100644
index b32d4c755..2689186e5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1723,6 +1723,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

4
CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,11 +1,11 @@
From ac63dd67abe6b9bc827d8fc2787a16718f0f6ec0 Mon Sep 17 00:00:00 2001
From 860d9ff29fccf8a4cf62fda4595decc61b59cfba Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 27 Feb 2016 10:07:58 +1100
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f3228665..73e19580 100644
index 855f7ff0a..0e90fd362 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2005,6 +2005,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {

4
CraftBukkit-Patches/0029-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From 395500981c5197ad793ff59bd023fe3bf65ede06 Mon Sep 17 00:00:00 2001
From 6ceb4dfc227c77632270181176a8c967b9b7934e Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 80ac1481..af8e8fd5 100644
index c77d04acd..668452809 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -633,6 +633,11 @@ public abstract class PlayerList {

4
CraftBukkit-Patches/0030-Plug-World-Unload-Memory-Leak.patch
View file

@ -1,11 +1,11 @@
From 43cb501b56da2f7c5083128f497be877e82be77a Mon Sep 17 00:00:00 2001
From 1676d2bdd32f47a559a6279dca5f3939663e432b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:02:59 +1000
Subject: [PATCH] Plug World Unload Memory Leak
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
index 7f1cc205..6a54da4d 100644
index 61454009f..c912fb8ae 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
@@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit

4
CraftBukkit-Patches/0031-Player-Collision-API.patch
View file

@ -1,11 +1,11 @@
From 16c3fe0f478f834cbf421318e255e4414703ec2f Mon Sep 17 00:00:00 2001
From 92d4dbb97be7e481949b3536925b6449eec43f1c 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 db133856..5eead283 100644
index db1338561..5eead2833 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1580,6 +1580,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
CraftBukkit-Patches/0032-Fully-Disable-Snooper-When-Not-Required.patch
View file

@ -1,14 +1,14 @@
From f3cfa3013d3887cded49e670633d050d9af4d92e Mon Sep 17 00:00:00 2001
From 2b4662c12d12c06cbc2093549f5e30f990386eaa Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d000f5bf..be3d54ee 100644
index de497fa50..4b865bc97 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -765,11 +765,11 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -804,11 +804,11 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
this.methodProfiler.a("snooper");

4
CraftBukkit-Patches/0033-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,11 +1,11 @@
From b9afd3b029842698c3b4a682e6e0628de4859f34 Mon Sep 17 00:00:00 2001
From f8aab71559d31df53a9c43de94818b675e9cb654 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 83eb0788..91d16574 100644
index 83eb07888..91d165746 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -741,6 +741,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

4
CraftBukkit-Patches/0034-Don-t-Special-Case-X-Move-Value.patch
View file

@ -1,11 +1,11 @@
From 54e7015859943db0a37b88e430653eda20cb0416 Mon Sep 17 00:00:00 2001
From a991962ff3f285f78b8b4ad12be77a36caa520e2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6761bced..f016681f 100644
index 2689186e5..213e0723e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -126,6 +126,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

4
CraftBukkit-Patches/0035-Implement-respawn-API.patch
View file

@ -1,11 +1,11 @@
From a067dc923b4e423424156828a8034f19f2e10adb Mon Sep 17 00:00:00 2001
From c5598619e21173fac2fd4d0e47ea20c1cba99b0a 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 5eead283..3ce1218a 100644
index 5eead2833..3ce1218a4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1590,6 +1590,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
CraftBukkit-Patches/0036-Arrow-Despawn-Rate.patch
View file

@ -1,11 +1,11 @@
From 791bb7cf3810373b214e2372d156f734e6521975 Mon Sep 17 00:00:00 2001
From 8b3e10d9819e9b70e09f2816793b587164654b2e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 1e502917..e16c8e8d 100644
index 1e5029170..e16c8e8d9 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -258,7 +258,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -18,7 +18,7 @@ index 1e502917..e16c8e8d 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 07a883f1..a4f1645a 100644
index 07a883f19..a4f1645a6 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -191,4 +191,11 @@ public class SpigotWorldConfig

22
CraftBukkit-Patches/0037-Watchdog-Thread.patch
View file

@ -1,11 +1,11 @@
From 680cffea3e50b4da3686449c4d19658d8507b1f0 Mon Sep 17 00:00:00 2001
From 5ee809cb94e282dfd3f27eb98337ab254bc4d3c9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 427668ec..52afacb8 100644
index dbd74d384..f90a43929 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -301,7 +301,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -18,10 +18,10 @@ index 427668ec..52afacb8 100644
thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index be3d54ee..f2b4462b 100644
index 4b865bc97..af93b811c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -675,6 +675,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -714,6 +714,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.a(crashreport);
} finally {
try {
@ -29,8 +29,8 @@ index be3d54ee..f2b4462b 100644
this.isStopped = true;
this.stop();
} catch (Throwable throwable1) {
@@ -780,6 +781,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.ao = this.ao * 0.8F + (float) l / 1000000.0F * 0.19999999F;
@@ -819,6 +820,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.ap = this.ap * 0.8F + (float) l / 1000000.0F * 0.19999999F;
this.methodProfiler.e();
this.methodProfiler.e();
+ org.spigotmc.WatchdogThread.tick(); // Spigot
@ -38,10 +38,10 @@ index be3d54ee..f2b4462b 100644
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 44341e2c..ac0a447f 100644
index 509cb8181..2ef172a4e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1829,6 +1829,11 @@ public final class CraftServer implements Server {
@@ -1811,6 +1811,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}
@ -55,7 +55,7 @@ index 44341e2c..ac0a447f 100644
public Spigot spigot()
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 00000000..49768734
index 000000000..49768734d
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,132 @@
@ -192,7 +192,7 @@ index 00000000..49768734
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index cec3c4b2..d8145db9 100644
index cec3c4b24..d8145db91 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -200,4 +200,18 @@ public class SpigotConfig
@ -216,7 +216,7 @@ index cec3c4b2..d8145db9 100644
}
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
new file mode 100644
index 00000000..de08ad67
index 000000000..de08ad67f
--- /dev/null
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -0,0 +1,117 @@

4
CraftBukkit-Patches/0038-Fix-Broken-Async-Chat.patch
View file

@ -1,11 +1,11 @@
From a890231d61b77c921b13e8b82dca7934372a5406 Mon Sep 17 00:00:00 2001
From 850d07787db55340ab76908b9e3fd580531740a0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 5 Dec 2013 13:55:53 +1100
Subject: [PATCH] Fix Broken Async Chat
diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java
index cfea4d54..c6dbfe30 100644
index cfea4d549..c6dbfe302 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInChat.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java
@@ -24,7 +24,24 @@ public class PacketPlayInChat implements Packet<PacketListenerPlayIn> {

4
CraftBukkit-Patches/0039-Fire-PreLogin-Events-in-Offline-Mode.patch
View file

@ -1,11 +1,11 @@
From cddb2fcaeec9cb3f0dfc6d89faa973e28f9c5159 Mon Sep 17 00:00:00 2001
From 6240ab1bd948a8462b44a216c76218bbfbc2486c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index c945f07f..e2ed8aef 100644
index acc2f0b60..0cf9d4bde 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -93,10 +93,23 @@ public class LoginListener implements PacketLoginInListener, ITickable {

18
CraftBukkit-Patches/0040-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 3076d6666e63bc2b262616b1660f15adc7b49ec2 Mon Sep 17 00:00:00 2001
From a3883ae11de748a8f4482a557fe68d93dd109a9b 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/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index f21450c6..7c75433f 100644
index 387d8a09f..5b784002f 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
@ -45,7 +45,7 @@ index f21450c6..7c75433f 100644
}
break;
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index e2ed8aef..2f6d79b0 100644
index 0cf9d4bde..a22f4c55e 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -96,9 +96,24 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -75,7 +75,7 @@ index e2ed8aef..2f6d79b0 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 7d425735..3326e959 100644
index 8a9b5046c..f3f77aebe 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -47,7 +47,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -104,7 +104,7 @@ index 7d425735..3326e959 100644
+ // Spigot End
}
diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
index 47b871df..7acdac55 100644
index 47b871dfc..7acdac55e 100644
--- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
+++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
@@ -13,7 +13,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@ -117,7 +117,7 @@ index 47b871df..7acdac55 100644
this.d = EnumProtocol.a(packetdataserializer.g());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index af8e8fd5..bbb8a06e 100644
index 668452809..9d0e29df7 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -479,7 +479,7 @@ public abstract class PlayerList {
@ -130,7 +130,7 @@ index af8e8fd5..bbb8a06e 100644
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3d6c4d7c..02835023 100644
index 2ef172a4e..eb4ba4c40 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -606,7 +606,13 @@ public final class CraftServer implements Server {
@ -149,7 +149,7 @@ index 3d6c4d7c..02835023 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 3ce1218a..6290c937 100644
index 3ce1218a4..6290c9374 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1581,6 +1581,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -166,7 +166,7 @@ index 3ce1218a..6290c937 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 d8145db9..06081dc6 100644
index d8145db91..06081dc64 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/0041-Allow-Disabling-Zombie-Villager-Aggression.patch
View file

@ -1,4 +1,4 @@
From fbc7f545f7e9bf435a43bea36d9c22c5d88ff0f2 Mon Sep 17 00:00:00 2001
From b7d109fb16ea2b923ca99050d3a8c49e98261c01 Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
Ability to configure if Zombies will be aggressive towards Villagers.
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index a1d03e56..b24e73f2 100644
index 581be66bc..3f0e636b7 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -54,7 +54,7 @@ public class EntityZombie extends EntityMonster {
@ -19,7 +19,7 @@ index a1d03e56..b24e73f2 100644
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget(this, EntityTurtle.class, 10, true, false, EntityTurtle.bC));
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index a4f1645a..14e33e58 100644
index a4f1645a6..14e33e588 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -198,4 +198,11 @@ public class SpigotWorldConfig

10
CraftBukkit-Patches/0042-Configurable-Amount-of-Netty-Threads.patch
View file

@ -1,4 +1,4 @@
From a87d0caffaaae5692d683293b8dc36688e274056 Mon Sep 17 00:00:00 2001
From 98f3659fa74d4ca72ada8fd847c2f8a3606767c0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f2b4462b..69a75bb1 100644
index af93b811c..e1732045e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -73,7 +73,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -18,7 +18,7 @@ index f2b4462b..69a75bb1 100644
private final ServerPing n = new ServerPing();
private final Random o = new Random();
public final DataFixer dataConverterManager;
@@ -164,7 +164,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -165,7 +165,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.W = gameprofilerepository;
this.X = usercache;
// this.universe = file; // CraftBukkit
@ -27,7 +27,7 @@ index f2b4462b..69a75bb1 100644
// this.convertable = file == null ? null : new WorldLoaderServer(file.toPath(), file.toPath().resolve("../backups"), datafixer); // CraftBukkit - moved to DedicatedServer.init
this.dataConverterManager = datafixer;
this.ac.a((IResourcePackListener) this.ah);
@@ -1367,7 +1367,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1421,7 +1421,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
public ServerConnection getServerConnection() {
@ -37,7 +37,7 @@ index f2b4462b..69a75bb1 100644
public boolean ai() {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 06081dc6..a4200e43 100644
index 06081dc64..a4200e43e 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -224,4 +224,11 @@ public class SpigotConfig

6
CraftBukkit-Patches/0043-Log-Cause-of-Unexpected-Exceptions.patch
View file

@ -1,14 +1,14 @@
From 562bf961326fee4e462a60eba2f20fa90bd8e79c Mon Sep 17 00:00:00 2001
From 2baf905d9336b0fa0eadf228279e0136ba1e8878 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:39:14 +1100
Subject: [PATCH] Log Cause of Unexpected Exceptions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 69a75bb1..442f101d 100644
index e1732045e..fdebfc5c7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -656,6 +656,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -695,6 +695,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
} catch (Throwable throwable) {
MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);

4
CraftBukkit-Patches/0044-Save-ticks-lived-to-nbttag.patch
View file

@ -1,11 +1,11 @@
From c4df719b0f451aa78b6d62a11caebe3ef7b008d4 Mon Sep 17 00:00:00 2001
From 9805c14a8207f1f272163f1b522b344ef6fe6027 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 73e19580..9ea87855 100644
index 0e90fd362..5017c95dd 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1566,6 +1566,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {

10
CraftBukkit-Patches/0045-Add-Option-to-Nerf-Mobs-from-Spawners.patch
View file

@ -1,11 +1,11 @@
From 4c1269fe38bd4fa2653cc320ab9a589d06fbe724 Mon Sep 17 00:00:00 2001
From 8aaeef929cb618d455cb2385083bca339b3da902 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawners
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9ea87855..9d116c94 100644
index 5017c95dd..03e395aed 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -17,7 +17,7 @@ index 9ea87855..9d116c94 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 3a128aa9..5de20721 100644
index 1b1c975e7..d24ff109c 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -638,6 +638,12 @@ public abstract class EntityInsentient extends EntityLiving {
@ -34,7 +34,7 @@ index 3a128aa9..5de20721 100644
this.bC.a();
this.world.methodProfiler.e();
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 3bb5a06c..967308d9 100644
index 3bb5a06cb..967308d97 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -110,7 +110,12 @@ public abstract class MobSpawnerAbstract {
@ -52,7 +52,7 @@ index 3bb5a06c..967308d9 100644
world.triggerEffect(2004, blockposition, 0);
if (entityinsentient != null) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 14e33e58..6c506841 100644
index 14e33e588..6c5068413 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -205,4 +205,11 @@ public class SpigotWorldConfig

4
CraftBukkit-Patches/0046-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,11 +1,11 @@
From 711d35da426d0c3b66cc6d9c99b3169104a4bbe2 Mon Sep 17 00:00:00 2001
From 6be643139b67f68b9c43a85398d096bf9ccaa789 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 6290c937..5f9b2762 100644
index 6290c9374..5f9b27624 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1380,7 +1380,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
CraftBukkit-Patches/0047-Add-Late-Bind-Option.patch
View file

@ -1,4 +1,4 @@
From d3be764521528ea92a26c2fead4e27c75926e0bd Mon Sep 17 00:00:00 2001
From a084d1a1a45dd0029d2be22e969885fe16c470ec Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option
Add late-bind config option to delay binding until loading is done.
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 52afacb8..a9f17c6d 100644
index f90a43929..3e0d513d6 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -188,6 +188,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -44,7 +44,7 @@ index 52afacb8..a9f17c6d 100644
Thread thread1 = new Thread(new ThreadWatchdog(this));
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a4200e43..33f0e3b8 100644
index a4200e43e..33f0e3b87 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -231,4 +231,9 @@ public class SpigotConfig

6
CraftBukkit-Patches/0048-Allow-statistics-to-be-disabled-forced.patch
View file

@ -1,11 +1,11 @@
From 1e4c0c34f6dea899fdea626447f1363a83b6fbd1 Mon Sep 17 00:00:00 2001
From b8257bbec8955bda3e6e3caa5e12a0f056ddabbc Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
index 3215f9dd..172f72fd 100644
index 38ff3b662..07e7db455 100644
--- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -37,6 +37,13 @@ public class ServerStatisticManager extends StatisticManager {
@ -39,7 +39,7 @@ index 3215f9dd..172f72fd 100644
this.e.add(statistic);
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 33f0e3b8..5d3060c0 100644
index 33f0e3b87..5d3060c01 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -10,10 +10,14 @@ import java.util.HashMap;

8
CraftBukkit-Patches/0049-Try-and-Debug-Crash-Reports-Crashing.patch
View file

@ -1,14 +1,14 @@
From a094113287e731e80af4e20c5fefd711fe4451ed Mon Sep 17 00:00:00 2001
From b0ddc42c7e1135b3cbc7c2280e3017ef64accc81 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 442f101d..6638ee27 100644
index fdebfc5c7..0c776692b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -860,7 +860,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -899,7 +899,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
worldserver.doTick();
worldserver.timings.doTick.stopTiming(); // Spigot
} catch (Throwable throwable) {
@ -22,7 +22,7 @@ index 442f101d..6638ee27 100644
worldserver.a(crashreport);
throw new ReportedException(crashreport);
}
@@ -870,7 +876,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -909,7 +915,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
worldserver.tickEntities();
worldserver.timings.tickEntities.stopTiming(); // Spigot
} catch (Throwable throwable1) {

12
CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From ccbc6c919ce4a9b02098047e9b9f1432abc2f189 Mon Sep 17 00:00:00 2001
From 3601e4b8cca85b621936b3a6fd09df3a7a5d54f1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Improve AutoSave Mechanism
@ -11,7 +11,7 @@ Instead we will mimic the save-all command in its behaviour, which is both safe
Also, only save modified chunks, or chunks with entities after 4 auto save passes
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 3f1dce9d..e54b84ba 100644
index 7f18563e7..d5aaf872a 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -904,7 +904,7 @@ public class Chunk implements IChunkAccess {
@ -24,7 +24,7 @@ index 3f1dce9d..e54b84ba 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 3e719d5c..62925a0c 100644
index 3e719d5cd..62925a0c7 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -250,7 +250,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -37,10 +37,10 @@ index 3e719d5c..62925a0c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6638ee27..65fd6544 100644
index 0c776692b..7aa788871 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -766,7 +766,17 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -805,7 +805,17 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
SpigotTimings.worldSaveTimer.startTiming(); // Spigot
this.methodProfiler.a("save");
this.s.savePlayers();
@ -60,7 +60,7 @@ index 6638ee27..65fd6544 100644
SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c6faa4bf..1834fae6 100644
index c6faa4bfe..1834fae6c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -727,12 +727,17 @@ public class CraftWorld implements World {

6
CraftBukkit-Patches/0051-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View file

@ -1,11 +1,11 @@
From 7b7b7016d20cb1f94f97f42e392e008401889f41 Mon Sep 17 00:00:00 2001
From 752a672aa6dab38a080f4de2c722ba0ef3b5b36a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
index 6f8d3748..11ffa6c3 100644
index 6f8d3748b..11ffa6c34 100644
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
@@ -41,6 +41,7 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
@ -17,7 +17,7 @@ index 6f8d3748..11ffa6c3 100644
nbtreadlimiter.a((long) (8 * j));
this.data = new byte[j];
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
index 1022c00b..f5c9b97d 100644
index 1022c00be..f5c9b97d5 100644
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
@@ -49,6 +49,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {

6
CraftBukkit-Patches/0052-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View file

@ -1,11 +1,11 @@
From ee225a6ec9d87ef2e9de7011bb1ce6c3ada4d81d Mon Sep 17 00:00:00 2001
From 7e6dc0a4d7cfbf4c492a467a1aabd7082c94931d Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 346d7c41..1f6089ac 100644
index 346d7c41b..1f6089ac5 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -33,7 +33,7 @@ public class BlockPortal extends Block {
@ -18,7 +18,7 @@ index 346d7c41..1f6089ac 100644
BlockPosition blockposition1;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 6c506841..243e2f5a 100644
index 6c5068413..243e2f5a1 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -212,4 +212,11 @@ public class SpigotWorldConfig

12
CraftBukkit-Patches/0053-Highly-Optimized-Tick-Loop.patch
View file

@ -1,14 +1,14 @@
From 074e1c77789736133f8c4e003315ab01662f5aa8 Mon Sep 17 00:00:00 2001
From 7316080501bd346405991b9dc4d68c8dfa363267 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 26 Jan 2017 21:50:51 +0000
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index bb130be80..e2f70ff0e 100644
index 7aa788871..540079fcb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -146,6 +146,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -147,6 +147,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
public File bukkitDataPackFolder;
public CommandDispatcher vanillaCommandDispatcher;
// CraftBukkit end
@ -21,7 +21,7 @@ index bb130be80..e2f70ff0e 100644
public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
this.ac = new ResourceManager(EnumResourcePackType.SERVER_DATA);
@@ -621,6 +627,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -660,6 +666,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.isRunning = false;
}
@ -35,8 +35,8 @@ index bb130be80..e2f70ff0e 100644
public void run() {
try {
if (this.init()) {
@@ -629,28 +642,36 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.n.setServerInfo(new ServerPing.ServerData("1.13-pre7", 389));
@@ -668,28 +681,36 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.n.setServerInfo(new ServerPing.ServerData("1.13", 393));
this.a(this.n);
+ // Spigot start

6
CraftBukkit-Patches/0054-Configurable-Ping-Sample-Size.patch
View file

@ -1,11 +1,11 @@
From 139c93cca8401e91fe49850d94eae0a36e66b44a Mon Sep 17 00:00:00 2001
From 8ab5431b009720eba1310517edd717f307cbeea1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
index 0e506305..c9edd289 100644
index 0e506305e..c9edd289a 100644
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -108,6 +108,13 @@ public class PacketStatusListener implements PacketStatusInListener {
@ -23,7 +23,7 @@ index 0e506305..c9edd289 100644
ServerPing ping = new ServerPing();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6096cccc..c5fb09e0 100644
index 6096cccc1..c5fb09e01 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -271,4 +271,11 @@ public class SpigotConfig

6
CraftBukkit-Patches/0055-Add-Optional-Tick-Shuffling.patch
View file

@ -1,4 +1,4 @@
From 9b8e7c15bb03672a120fa6e4b85c19dd961e4446 Mon Sep 17 00:00:00 2001
From 99c7aceacfaffb6360904d9f2993bd2f330d28f4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -6,7 +6,7 @@ Subject: [PATCH] Add Optional Tick Shuffling
This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order.
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
index d62670ac..440bb0c8 100644
index d62670ac5..440bb0c8b 100644
--- a/src/main/java/net/minecraft/server/ServerConnection.java
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -102,6 +102,13 @@ public class ServerConnection {
@ -24,7 +24,7 @@ index d62670ac..440bb0c8 100644
while (iterator.hasNext()) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index c5fb09e0..19eb87a4 100644
index c5fb09e01..19eb87a4b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -278,4 +278,10 @@ public class SpigotConfig

4
CraftBukkit-Patches/0056-Implement-Locale-Getter-for-Players.patch
View file

@ -1,11 +1,11 @@
From 127e38948a8866e678a0170d48b665de11ed44eb Mon Sep 17 00:00:00 2001
From 3201138841ef933823db953524673fd221537c99 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5f9b2762..b9e54138 100644
index 5f9b27624..b9e541380 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1605,6 +1605,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
CraftBukkit-Patches/0057-Spam-Filter-Exclusions.patch
View file

@ -1,11 +1,11 @@
From dbb0eb899c586cac19a48c257e8859502df08680 Mon Sep 17 00:00:00 2001
From 4ce10e2a2a24b602abb02c219fd7b52811af3e32 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3b208761c..6f7b41957 100644
index 213e0723e..a105669a6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1467,9 +1467,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

2
CraftBukkit-Patches/0058-Add-Option-to-Silence-CommandBlock-Console.patch
View file

@ -1,4 +1,4 @@
From 848a65e62414e5d31305fc197f4b3873167567b2 Mon Sep 17 00:00:00 2001
From 70a496c07905877413da2a7e17add4208c77e885 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console

4
CraftBukkit-Patches/0059-Add-support-for-fetching-hidden-players.patch
View file

@ -1,11 +1,11 @@
From 60ad8ba486b4e6ebbc46a9516aa6112396f1bd53 Mon Sep 17 00:00:00 2001
From f91b97a9effd88b54c64c056fea59e299d9b013e 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 b9e54138..a2ab1c19 100644
index b9e541380..a2ab1c194 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1611,6 +1611,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
CraftBukkit-Patches/0060-Cap-Channel-Registrations.patch
View file

@ -1,11 +1,11 @@
From 05ffe01e80160f1010a53930600ad6af40211070 Mon Sep 17 00:00:00 2001
From 53bac13f71688798724fc859ecd09e44eeb94b55 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 20:02:58 +1100
Subject: [PATCH] Cap Channel Registrations
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a2ab1c19..4aa50915 100644
index a2ab1c194..4aa50915a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1198,6 +1198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
CraftBukkit-Patches/0061-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View file

@ -1,11 +1,11 @@
From 14a0f7e27a5cd8da61035d1009b24776bbce76c0 Mon Sep 17 00:00:00 2001
From 12379abc3129397bc7351f4e492d5e96ac96277a Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3d0cde333..fd62c3a62 100644
index eb4ba4c40..36bab78d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -339,8 +339,11 @@ public final class CraftServer implements Server {

8
CraftBukkit-Patches/0062-Implement-Silenceable-Lightning-API.patch
View file

@ -1,11 +1,11 @@
From b6038ea6cce9ecb3ed8912c89e256dae71625210 Mon Sep 17 00:00:00 2001
From 8d560f4efa523d049243d3b8d252498c49a0ddf9 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/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
index e69d6cf5..afbe43dd 100644
index e69d6cf55..afbe43dd3 100644
--- a/src/main/java/net/minecraft/server/EntityLightning.java
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
@@ -15,6 +15,7 @@ public class EntityLightning extends EntityWeather {
@ -41,7 +41,7 @@ index e69d6cf5..afbe43dd 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1834fae6..a5dd3934 100644
index 1834fae6c..a5dd39348 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1590,6 +1590,22 @@ public class CraftWorld implements World {
@ -68,7 +68,7 @@ index 1834fae6..a5dd3934 100644
public 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 194d830e..ddd5ccd5 100644
index 194d830e1..ddd5ccd58 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -31,6 +31,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike

4
CraftBukkit-Patches/0063-Use-one-PermissibleBase-for-all-Command-Blocks.patch
View file

@ -1,11 +1,11 @@
From 24434e246227e251acdcbf60292d7bdd076cdc44 Mon Sep 17 00:00:00 2001
From fa6c7bbe7f0097b7a941e69129162ab9ff7ab4fe Mon Sep 17 00:00:00 2001
From: FrozenBrain <carstenbamsti@googlemail.com>
Date: Sun, 2 Mar 2014 21:13:46 +0100
Subject: [PATCH] Use one PermissibleBase for all Command Blocks
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
index a461a935..c10a8445 100644
index a461a935b..c10a84452 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -12,9 +12,18 @@ import org.bukkit.plugin.Plugin;

4
CraftBukkit-Patches/0064-Prevent-hoppers-from-loading-chunks.patch
View file

@ -1,11 +1,11 @@
From b7632e9926bd8dfb2639a2767bf3f654116231e3 Mon Sep 17 00:00:00 2001
From ead1552c2df22903a65e42b0654fb2f3c46032e9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 5 Mar 2014 20:27:27 +0000
Subject: [PATCH] Prevent hoppers from loading chunks
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 8af2d301..fa7ba510 100644
index d0d271475..bb41d4780 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -523,6 +523,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi

4
CraftBukkit-Patches/0065-Guard-Entity-List.patch
View file

@ -1,11 +1,11 @@
From 6e42d463a1530690bd442a3fba5e19485900f5e2 Mon Sep 17 00:00:00 2001
From e939bbe74f0757b7c829834e99b0fc9070dbda5f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 10 Mar 2014 09:03:28 +1100
Subject: [PATCH] Guard Entity List
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6207a4cd..33f606a9 100644
index ce5fa30b2..f751fafa9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -38,7 +38,32 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

4
CraftBukkit-Patches/0066-Fix-ConcurrentModificationException-while-being-idle.patch
View file

@ -1,4 +1,4 @@
From 32a9459a3b6b9b8d9ca0294422655e8cdf4c5f12 Mon Sep 17 00:00:00 2001
From 16f40ed10458c25decc5da89c6f1925cbf1cde87 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 33f606a9..d27a57b1 100644
index f751fafa9..4223b219a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,4 +1,4 @@

4
CraftBukkit-Patches/0067-Cancellable-WitherSkull-potion-effect.patch
View file

@ -1,11 +1,11 @@
From ff5d0b48c9568018612a4fff3a14d2094335b364 Mon Sep 17 00:00:00 2001
From f21970bbc19a03a0513a2f503cbce4488429e334 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Tue, 25 Feb 2014 15:15:26 -0400
Subject: [PATCH] Cancellable WitherSkull potion effect
diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
index d43503d2..e9d3363b 100644
index 8249bf112..0103837ab 100644
--- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
+++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
@@ -29,8 +29,11 @@ public class EntityWitherSkull extends EntityFireball {

6
CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch
View file

@ -1,11 +1,11 @@
From 813648acc530f015bc4100e29a6494b1420f3db9 Mon Sep 17 00:00:00 2001
From f546f98e686f069e6ce25bfaf5f64ffd174e92ae Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 15 Mar 2014 01:30:05 -0400
Subject: [PATCH] Descriptive kick reasons instead of Nope!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2a9515923..015959b9f 100644
index 03e395aed..5046ecb3b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -289,7 +289,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -27,7 +27,7 @@ index 2a9515923..015959b9f 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6f7b41957..c728e61c1 100644
index a105669a6..862449c98 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1388,7 +1388,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

8
CraftBukkit-Patches/0069-Configurable-dragon-death-and-wither-spawn-sounds.patch
View file

@ -1,11 +1,11 @@
From 6d474644498394fe7a6d51c12ec2b589f3a26369 Mon Sep 17 00:00:00 2001
From ce5cfece16a036cadb7677236bb4cdb9107e0daf Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 29 Mar 2014 13:44:25 -0400
Subject: [PATCH] Configurable dragon death and wither spawn sounds
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index e8cb895c..24cce6c0 100644
index caf1a0045..bbd807315 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -571,7 +571,24 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@ -35,7 +35,7 @@ index e8cb895c..24cce6c0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 4c335f35..e9d9ec23 100644
index 696e1331e..4f73b02ba 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -204,6 +204,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@ -47,7 +47,7 @@ index 4c335f35..e9d9ec23 100644
double deltaLength = Math.sqrt(distanceSquared);
double relativeX = player.locX + (deltaX / deltaLength) * viewDistance;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 243e2f5a..96bf3ade 100644
index 243e2f5a1..96bf3adec 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -219,4 +219,16 @@ public class SpigotWorldConfig

6
CraftBukkit-Patches/0070-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
View file

@ -1,4 +1,4 @@
From f479083474552177000f3d96eadacb6c362e30ac Mon Sep 17 00:00:00 2001
From ded2da6074f7182c22771e947747c65b17a62884 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 11 Apr 2014 11:16:34 +0100
Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index aa215fde..d13e9138 100644
index 540079fcb..d644ea0f4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1143,7 +1143,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1197,7 +1197,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
}
public String getServerModName() {

6
CraftBukkit-Patches/0071-Treat-Bungee-as-Online-Mode.patch
View file

@ -1,11 +1,11 @@
From c99dd7d1bc7b4e0cf249009dbe294f4b49982989 Mon Sep 17 00:00:00 2001
From ec4d4798fdd7edd5aaf620ba45f4fa5f9f41ac5b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 21:23:58 +1000
Subject: [PATCH] Treat Bungee as Online Mode
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index a9f17c6d..65ca0bdd 100644
index 3e0d513d6..21dae1f88 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -208,7 +208,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -25,7 +25,7 @@ index a9f17c6d..65ca0bdd 100644
}
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
index b00938b2..33e5aaf2 100644
index b00938b21..33e5aaf2c 100644
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -59,7 +59,7 @@ public class NameReferencingFileConverter {

4
CraftBukkit-Patches/0072-Add-Conversion-Message.patch
View file

@ -1,11 +1,11 @@
From 02cf73d1d5d87cd593eddefd6507133c19c3c620 Mon Sep 17 00:00:00 2001
From 185a59e2bb9179a747ce89fd758dff0ffc7404d4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 23:30:44 +1000
Subject: [PATCH] Add Conversion Message
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 65ca0bdd..6283fce5 100644
index 21dae1f88..5dd323b12 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -577,6 +577,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

4
CraftBukkit-Patches/0073-Print-Stack-on-InternalException.patch
View file

@ -1,11 +1,11 @@
From 34863f6743d3a7632edc2536f64869dd665ad0b5 Mon Sep 17 00:00:00 2001
From 00d0f8b03e53606cd733e70f39f03079759f3b8d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 09:00:59 +1000
Subject: [PATCH] Print Stack on InternalException
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 3326e959..c7f55041 100644
index f3f77aebe..88aad6d43 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -118,6 +118,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {

4
CraftBukkit-Patches/0074-Use-Offline-Player-Data-Once-if-Required.patch
View file

@ -1,4 +1,4 @@
From 446423e61e73f89a2c9e8f4d5bfa7d0ed5915471 Mon Sep 17 00:00:00 2001
From e4fbbb49183517488d5af67b48d81fe24dc2c344 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 14:41:23 +1000
Subject: [PATCH] Use Offline Player Data Once if Required.
@ -6,7 +6,7 @@ Subject: [PATCH] Use Offline Player Data Once if Required.
If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again.
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 752da4a8..0e0ebd40 100644
index 752da4a80..0e0ebd403 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -167,10 +167,28 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {

4
CraftBukkit-Patches/0075-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
View file

@ -1,11 +1,11 @@
From 999deb46752efdd5ea71bb51f655335b7b2a80a3 Mon Sep 17 00:00:00 2001
From b866dfa6c02205e349ffe4da6dde1619526fb4fd Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 09:46:20 +1000
Subject: [PATCH] Use Provided Case for Non Existent Offline Players
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index 08ba68fb..674243c4 100644
index 08ba68fba..674243c49 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -154,7 +154,7 @@ public class UserCache {

6
CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch
View file

@ -1,14 +1,14 @@
From 2aa66135e5d0e1f6cf2b4b4c2f30f674578c0df9 Mon Sep 17 00:00:00 2001
From 2cee4c3ee3278cbdfbb39234f3c198f8c8f00688 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 17:21:24 +1000
Subject: [PATCH] Check for blank OfflinePlayer Names
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 77b5898b..8c6fa46e 100644
index 36bab78d5..d73ea2297 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1329,6 +1329,7 @@ public final class CraftServer implements Server {
@@ -1311,6 +1311,7 @@ public final class CraftServer implements Server {
@Deprecated
public OfflinePlayer getOfflinePlayer(String name) {
Validate.notNull(name, "Name cannot be null");

Some files were not shown because too many files have changed in this diff Show more