CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove stats completely from patches.

Browse Source
This commit is contained in:
md_5 2013-04-10 14:08:33 +10:00
parent 9d224f6036
commit d9c76252eb
49 changed files with 51 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bukkit-Patches/0001-Spigot-POM-Changes.patch
View File

@ -1,11 +1,8 @@
From b3d1655d3b2698fb58bfe06f40d50c9fc465b2b4 Mon Sep 17 00:00:00 2001
From 62ed461e820ad8337a71486c1dbc2594c9b6e2c6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 30 Jan 2013 23:44:29 -0500
Subject: [PATCH] Spigot POM Changes.
---
pom.xml | 44 ++++++++++++--------------------------------
1 file changed, 12 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index d5db496..4c8ff29 100644
@ -68,5 +65,5 @@ index d5db496..4c8ff29 100644
<plugins>
<plugin>
--
1.7.11.msysgit.0
1.8.2.1

6
Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch
View File

@ -1,12 +1,8 @@
From 6c126ae7abb177b176c616251c667517aa79456d Mon Sep 17 00:00:00 2001
From 960006c6915427e176d8c0cd84f802fbf393d665 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 9 Jan 2013 16:53:45 -0500
Subject: [PATCH] Measure the duration of the entire timings run.
---
src/main/java/org/bukkit/command/defaults/TimingsCommand.java | 4 ++++
src/main/java/org/bukkit/plugin/SimplePluginManager.java | 2 ++
2 files changed, 6 insertions(+)
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
index 29ebbe0..94cd62c 100644

10
Bukkit-Patches/0003-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From a39f7f351d143b534f6fe754c22efce24b2f6ab1 Mon Sep 17 00:00:00 2001
From 33ffd896356f9cff9cde44e093bade06e801e39c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 9 Jan 2013 22:18:26 -0500
Subject: [PATCH] Improved Timings System
@ -7,14 +7,6 @@ Enables "Timings on Demand" so you can enable/disable timings without server res
Tracks timings on sync events a plugin registers (Single and Repeating)
Tracks how many ticks a timed area has caused the server to lose due to taking too long.
Enables automatically pasting to paste.ubuntu.com so you can quickly review the results on aikar.co/timings.php
---
src/main/java/org/bukkit/CustomTimingsHandler.java | 134 +++++++++++++++++++++
.../org/bukkit/command/defaults/ReloadCommand.java | 2 +
.../bukkit/command/defaults/TimingsCommand.java | 90 ++++++++++++--
.../org/bukkit/plugin/TimedRegisteredListener.java | 12 +-
.../org/bukkit/plugin/java/JavaPluginLoader.java | 2 +-
5 files changed, 227 insertions(+), 13 deletions(-)
create mode 100644 src/main/java/org/bukkit/CustomTimingsHandler.java
diff --git a/src/main/java/org/bukkit/CustomTimingsHandler.java b/src/main/java/org/bukkit/CustomTimingsHandler.java
new file mode 100644

5
Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch
View File

@ -1,11 +1,8 @@
From dc1e04e664925d6c14823cb881c6cb5625fd41f5 Mon Sep 17 00:00:00 2001
From ed59e1ea0da9d4136dffe6056056748bcef8bfc3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 2 Feb 2013 16:40:42 +1100
Subject: [PATCH] Add nag for bad plugins.
---
src/main/java/org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 29ec3fc..a31500c 100644

6
Bukkit-Patches/0005-PlayerItemDamageEvent.patch
View File

@ -1,12 +1,8 @@
From 47fad07cf72d34c038ba0bae648c70a40dd00276 Mon Sep 17 00:00:00 2001
From 322c319a37b54ff2af1b3f8cb8b9c57ed88ae59f 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] PlayerItemDamageEvent
---
.../bukkit/event/player/PlayerItemDamageEvent.java | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
new file mode 100644

7
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,8 @@
From 041eef1c47706a03cde2f2343e4f2babf4ed63e9 Mon Sep 17 00:00:00 2001
From fff42db730cc4f3b8e39306677f1bbcafbffd76c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:44:24 +1100
Subject: [PATCH] POM Changes.
---
pom.xml | 61 ++++++++++++++++++++++++-------------------------------------
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6415183..fce45f8 100644
@ -120,5 +117,5 @@ index 6415183..fce45f8 100644
<execution>
<phase>package</phase>
--
1.7.11.msysgit.0
1.8.2.1

8
CraftBukkit-Patches/0002-mc-dev-imports.patch
View File

@ -1,15 +1,9 @@
From 0252b7ffef6ff353b9c4c54d9e53a8b452c2ac47 Mon Sep 17 00:00:00 2001
From 9a4bd51255887005eeb7fa78bf013ba9ed166394 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 10 Apr 2013 13:52:52 +1000
Subject: [PATCH] mc-dev imports
2 files changed, 160 insertions(+)
---
.../java/net/minecraft/server/NibbleArray.java | 40 +++++++
.../java/net/minecraft/server/OldChunkLoader.java | 120 +++++++++++++++++++++
2 files changed, 160 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/NibbleArray.java
create mode 100644 src/main/java/net/minecraft/server/OldChunkLoader.java
diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
new file mode 100644

29
CraftBukkit-Patches/0003-Spigot-Changes.patch
View File

@ -1,36 +1,9 @@
From 2853b69264cbea6a20328a2220c72ffa517d03c0 Mon Sep 17 00:00:00 2001
From 86ac1a6679d21066a6360b12031ebdc7305e6d79 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 17:57:27 +1100
Subject: [PATCH] Spigot Changes
The set of changes which provide core Spigot functionality, which would otherwise be a mess to try and apply individually.
---
.gitignore | 2 +
src/main/java/net/minecraft/server/Block.java | 12 +++
.../java/net/minecraft/server/BlockCactus.java | 2 +-
src/main/java/net/minecraft/server/BlockCrops.java | 2 +-
src/main/java/net/minecraft/server/BlockGrass.java | 3 +-
.../java/net/minecraft/server/BlockMushroom.java | 2 +-
src/main/java/net/minecraft/server/BlockMycel.java | 3 +-
src/main/java/net/minecraft/server/BlockReed.java | 2 +-
.../java/net/minecraft/server/BlockSapling.java | 2 +-
src/main/java/net/minecraft/server/BlockStem.java | 2 +-
.../net/minecraft/server/ChunkRegionLoader.java | 35 +++++--
.../java/net/minecraft/server/ChunkSection.java | 31 ++++--
src/main/java/net/minecraft/server/EntityItem.java | 3 +-
.../java/net/minecraft/server/EntitySquid.java | 4 -
.../net/minecraft/server/PlayerConnection.java | 19 +++-
src/main/java/net/minecraft/server/PlayerList.java | 10 +-
.../net/minecraft/server/ThreadLoginVerifier.java | 21 ++++
src/main/java/net/minecraft/server/World.java | 111 +++++++++++++++++----
.../java/net/minecraft/server/WorldServer.java | 36 ++++++-
.../java/org/bukkit/craftbukkit/CraftServer.java | 47 +++++----
.../java/org/bukkit/craftbukkit/CraftWorld.java | 71 ++++++++++++-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 20 ++++
.../craftbukkit/chunkio/ChunkIOProvider.java | 2 +-
src/main/resources/configurations/bukkit.yml | 26 +++++
24 files changed, 390 insertions(+), 78 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
diff --git a/.gitignore b/.gitignore
index c3faf57..346b232 100644

8
CraftBukkit-Patches/0004-Merge-tweaks-and-configuration.patch
View File

@ -1,15 +1,9 @@
From 5e01bfb87ed1cf7b5277fcc508726a4871ea62ac Mon Sep 17 00:00:00 2001
From 733da598baf9b69a7c1522582941ef45442566b8 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
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.
---
src/main/java/net/minecraft/server/EntityItem.java | 17 +++++++++++------
src/main/java/net/minecraft/server/World.java | 17 +++++++++++++++++
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 6 ++++++
src/main/resources/configurations/bukkit.yml | 2 ++
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index aa8d83f..6d54e97 100644

8
CraftBukkit-Patches/0005-LongHash-Tweaks.patch
View File

@ -1,15 +1,9 @@
From 03b486fc7abc3ecea870b646c13a2a5797ea4796 Mon Sep 17 00:00:00 2001
From 898ceae38bdfae77816b9f79e433ad97a8dac4b5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:29:43 +1100
Subject: [PATCH] LongHash Tweaks.
This commit adds a flat array based cache to the LongHash(Set/Map) classes leading to excellent efficiency for servers where most activity is centered around the origin (0,0)
---
.../java/org/bukkit/craftbukkit/util/FlatMap.java | 34 ++++++++++++++++++++++
.../org/bukkit/craftbukkit/util/LongHashSet.java | 8 ++++-
.../bukkit/craftbukkit/util/LongObjectHashMap.java | 5 ++++
3 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/FlatMap.java
diff --git a/src/main/java/org/bukkit/craftbukkit/util/FlatMap.java b/src/main/java/org/bukkit/craftbukkit/util/FlatMap.java
new file mode 100644

9
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View File

@ -1,16 +1,9 @@
From 7cf90500080ff81fe958afe6a7b612b6bf681532 Mon Sep 17 00:00:00 2001
From ae810f2bc90405ea57328770e9edb5425368f82c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +1100
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.
---
src/main/java/net/minecraft/server/EntityTracker.java | 2 ++
src/main/java/net/minecraft/server/EntityTrackerEntry.java | 2 ++
src/main/java/net/minecraft/server/World.java | 2 ++
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 3 +++
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 +
5 files changed, 10 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 4de1273..db62084 100644

8
CraftBukkit-Patches/0007-View-Distance.patch
View File

@ -1,15 +1,9 @@
From 52a7e6fa033f6c9337814d23cd5c92a1ce231bf1 Mon Sep 17 00:00:00 2001
From fbc59e7f362ffa16606bdb94bbaa765bf84b05c6 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
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!
---
src/main/java/net/minecraft/server/PlayerChunkMap.java | 2 +-
src/main/java/net/minecraft/server/WorldServer.java | 2 +-
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 5 +++++
src/main/resources/configurations/bukkit.yml | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 0dfd190..c543bed 100644

5
CraftBukkit-Patches/0008-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
View File

@ -1,13 +1,10 @@
From 88282823288a27cc62a55eebf277c7fc5f249f41 Mon Sep 17 00:00:00 2001
From 74653439cba166878e6e263082cde72cce8a4a5c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:09:40 +1100
Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when
a secondary container is closed due to the player entity being destroyed.
This covers all edge cases such as server stop / player kick / player quit.
---
src/main/java/net/minecraft/server/EntityHuman.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 91b44a0..df33d80 100644

9
CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
View File

@ -1,4 +1,4 @@
From 08e4e84c8cf2e75fb8e052b8ef74773dc0e7a5fa Mon Sep 17 00:00:00 2001
From 3d38587aa973e480cb8934c99d2f6911ce118151 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 23 Dec 2012 14:46:23 -0600
Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
@ -8,13 +8,6 @@ Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
Finish up NibbleArray lightening work - use for Snapshots, reduce copies
Fix nibble handling with NBT - arrays aren't copied by NBTByteArray
---
.../net/minecraft/server/ChunkRegionLoader.java | 10 +-
.../java/net/minecraft/server/ChunkSection.java | 24 ++--
.../java/net/minecraft/server/NibbleArray.java | 122 ++++++++++++++++++++-
.../net/minecraft/server/Packet51MapChunk.java | 28 +++--
.../java/org/bukkit/craftbukkit/CraftChunk.java | 44 +++++++-
5 files changed, 197 insertions(+), 31 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index b9704bd..7a98822 100644

5
CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch
View File

@ -1,11 +1,8 @@
From 049772527f3ab878bb0ac13939184229c3f46e6c Mon Sep 17 00:00:00 2001
From f2a957fcd4a22ec15721eb5696c4ae404587c89e Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:49:07 -0800
Subject: [PATCH] Fix mcRegion-to-Anvil conversion
---
src/main/java/net/minecraft/server/OldChunkLoader.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
index 53c1cb5..9a9e20f 100644

5
CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch
View File

@ -1,11 +1,8 @@
From 1ec84fa256384b8396ea6ec9ad82b016ab30a155 Mon Sep 17 00:00:00 2001
From c75c722c045962b2e8908b92af643ceba6bcd613 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Tue, 15 Jan 2013 15:05:02 +1100
Subject: [PATCH] Update versioning check to correctly resolve api version.
---
src/main/java/org/bukkit/craftbukkit/util/Versioning.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index f905d17..9304637 100644

6
CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch
View File

@ -1,13 +1,9 @@
From 4466ad548b5ab288d65a39030f9766725a46b3cd Mon Sep 17 00:00:00 2001
From f623e062de37c65c8e65ff2491f6f7deebc5fc68 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Fri, 18 Jan 2013 16:20:01 +0500
Subject: [PATCH] Optimize packet used to unload chunks for the client
At the moment telling a client to unload a chunk involves calling the entire chunk from memory, deflating it and then sending it through the pipes even though the client ignores it and based on the bitmap simply unloads the chunk, and to add the cherry on top, this is done on the main server thread.
---
src/main/java/net/minecraft/server/Packet51MapChunk.java | 13 +++++++++++++
src/main/java/net/minecraft/server/PlayerChunk.java | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
index ee179be..b51d90c 100644

5
CraftBukkit-Patches/0013-Skip-entity.move-if-we-are-not-moving-anywhere.patch
View File

@ -1,11 +1,8 @@
From 460f7249412d2a51f500ed8e307e2e3596a03759 Mon Sep 17 00:00:00 2001
From ed8f394566a78a2660472fa790bb50f1c780a281 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 19 Jan 2013 01:11:30 -0500
Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
---
src/main/java/net/minecraft/server/Entity.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7890d6f..8e743ec 100644

5
CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch
View File

@ -1,11 +1,8 @@
From 2338cb87b1abac89c21f2f9bbcfe19177e92e90c Mon Sep 17 00:00:00 2001
From f9fe180eef563c01afa127cd687b41bb1ba5c0af Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 16 Jan 2013 15:27:22 -0600
Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache
---
src/main/java/net/minecraft/server/World.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 92e8a37..b4ec71e 100644

8
CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
View File

@ -1,14 +1,8 @@
From 855c2ff526d476e0b59359e209d673e67fe363cf Mon Sep 17 00:00:00 2001
From 64a476e80485ab2a1a28f1b1809071f261eed141 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:28:17 +1100
Subject: [PATCH] Tick loop optimization - sleep for as long as possible.
---
.../java/net/minecraft/server/MinecraftServer.java | 50 +++++++++-------------
src/main/java/org/bukkit/craftbukkit/Spigot.java | 2 +
.../craftbukkit/command/TicksPerSecondCommand.java | 35 +++++++++++++++
3 files changed, 57 insertions(+), 30 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/command/TicksPerSecondCommand.java
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 64d5882..8de8570 100644

15
CraftBukkit-Patches/0016-Improved-Timings-System.patch
View File

@ -1,22 +1,9 @@
From 0769dc792bdf91ab5f41213501df138fdbc0c0e7 Mon Sep 17 00:00:00 2001
From eac5b5044c9871541b4503fa158232f5c4a020e5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
---
.../net/minecraft/server/ChunkProviderServer.java | 2 +
src/main/java/net/minecraft/server/Entity.java | 5 +
.../java/net/minecraft/server/EntityLiving.java | 10 ++
.../java/net/minecraft/server/MinecraftServer.java | 17 +++-
.../net/minecraft/server/PlayerConnection.java | 5 +
src/main/java/net/minecraft/server/TileEntity.java | 2 +
src/main/java/net/minecraft/server/World.java | 17 ++++
.../java/net/minecraft/server/WorldServer.java | 4 +
.../java/org/bukkit/craftbukkit/SpigotTimings.java | 110 +++++++++++++++++++++
.../bukkit/craftbukkit/scheduler/CraftTask.java | 18 ++++
10 files changed, 189 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 8b280ab..31e3fce 100644

16
CraftBukkit-Patches/0017-Add-oreobfuscator-for-Spigot.patch
View File

@ -1,22 +1,8 @@
From f289fb8aaddc2a4864b4f8e934310cd11caeff69 Mon Sep 17 00:00:00 2001
From 50bc4517a46a353fdd95685653da987eece96a49 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 10:58:17 +1100
Subject: [PATCH] Add oreobfuscator for Spigot.
---
.../net/minecraft/server/EntityFallingBlock.java | 1 +
src/main/java/net/minecraft/server/Explosion.java | 1 +
.../net/minecraft/server/Packet51MapChunk.java | 14 +-
.../net/minecraft/server/Packet56MapChunkBulk.java | 21 ++-
.../java/net/minecraft/server/PlayerChunk.java | 2 +-
.../minecraft/server/PlayerInteractManager.java | 5 +
.../java/org/bukkit/craftbukkit/CraftServer.java | 7 +
.../java/org/bukkit/craftbukkit/CraftWorld.java | 4 +
src/main/java/org/bukkit/craftbukkit/Spigot.java | 9 ++
.../java/org/spigotmc/OrebfuscatorManager.java | 146 +++++++++++++++++++++
src/main/resources/configurations/bukkit.yml | 7 +
11 files changed, 213 insertions(+), 4 deletions(-)
create mode 100644 src/main/java/org/spigotmc/OrebfuscatorManager.java
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 17d837d..ecc52b9 100644

5
CraftBukkit-Patches/0018-Reduce-number-of-LivingEntity-collision-checks.patch
View File

@ -1,11 +1,8 @@
From 3a0a265c91648ce4e8d45db8a762d94f7c42c86f Mon Sep 17 00:00:00 2001
From d55bf0e93b31f79467195af477860b32dba05a1e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Jan 2013 19:31:14 -0500
Subject: [PATCH] Reduce number of LivingEntity collision checks.
---
src/main/java/net/minecraft/server/EntityLiving.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 14854ac..322e37f 100644

5
CraftBukkit-Patches/0019-Only-count-entities-in-chunks-being-processed-for-th.patch
View File

@ -1,12 +1,9 @@
From fd62940cec88d33e07b78585f2c5deb264758669 Mon Sep 17 00:00:00 2001
From 5fe8737ece46cdaf9a021fa83e1e55f621275634 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 29 Jan 2013 13:25:53 -0500
Subject: [PATCH] Only count entities in chunks being processed for the spawn
wave. Fixes mob spawn issues.
---
.../java/net/minecraft/server/SpawnerCreature.java | 46 ++++++++++++++++++++--
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index b3e2818..6362a37 100644

5
CraftBukkit-Patches/0020-Detect-remove-and-warn-about-null-tile-entities.patch
View File

@ -1,11 +1,8 @@
From beebf944f3e9a21c0e2678e393d3206070d75261 Mon Sep 17 00:00:00 2001
From b57ab0df2be482a7c4a9b30a46200659b1f2bf90 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] Detect, remove and warn about null tile entities.
---
src/main/java/net/minecraft/server/World.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e2d0a88..16bd795 100644

12
CraftBukkit-Patches/0021-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From a3f44a9f8e92d0fea010f437e5c949fda218fac9 Mon Sep 17 00:00:00 2001
From a5e2821e1124465ae5b999e89ba22a19150f762b 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
@ -7,16 +7,6 @@ This feature gives 3 new configurable ranges that if an entity of the matching t
This will drastically cut down on tick timings for entities that are not in range of a user to actually be "used".
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
---
src/main/java/net/minecraft/server/Entity.java | 13 +-
.../java/net/minecraft/server/EntityArrow.java | 2 +-
src/main/java/net/minecraft/server/EntityItem.java | 5 +-
src/main/java/net/minecraft/server/World.java | 10 +-
.../java/org/bukkit/craftbukkit/CraftWorld.java | 15 ++
src/main/java/org/bukkit/craftbukkit/Spigot.java | 219 +++++++++++++++++++++
.../java/org/bukkit/craftbukkit/SpigotTimings.java | 3 +
src/main/resources/configurations/bukkit.yml | 3 +
8 files changed, 264 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8feb1d3..482fecb 100644

5
CraftBukkit-Patches/0022-Optimize-getTileEntities-performance.patch
View File

@ -1,12 +1,9 @@
From 78db1b3041b718fe4b343c4f31934713e9d47759 Mon Sep 17 00:00:00 2001
From 8d27525a8a31f519e1a587af176fc9ec326c09e8 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 20 Feb 2013 23:07:53 -0500
Subject: [PATCH] Optimize getTileEntities performance
Avoid traversing tile entities for every loaded chunk
---
src/main/java/net/minecraft/server/WorldServer.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0abfc35..615968f 100644

5
CraftBukkit-Patches/0023-Improved-tile-entity-lookup-for-chunk-sending.patch
View File

@ -1,13 +1,10 @@
From 783430598f8aad57eccc92ccd75fc54926cf2e4a Mon Sep 17 00:00:00 2001
From 0a07b5d906ed825ec54f3f3b7ec2906ddaadc27e Mon Sep 17 00:00:00 2001
From: shakytom <tom.roberts00@gmail.com>
Date: Wed, 20 Feb 2013 22:34:38 -0500
Subject: [PATCH] Improved tile entity lookup for chunk sending
Instead of scanning the entire worlds tile entities to find out what tile entities are in the chunk... just use the arraylist of tile entities we already have.
This results in a good reduction of time spent in player ticking.
---
src/main/java/net/minecraft/server/EntityPlayer.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index eb07d8e..410148f 100644

7
CraftBukkit-Patches/0024-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
View File

@ -1,14 +1,9 @@
From b470bfa02c986436da0d3d91888c3983a0ce6523 Mon Sep 17 00:00:00 2001
From fcf8d194aaa25f7e619a713a5c025a550e746a96 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. Rewrite the Metrics system to be closer to the
Bukkit version.
---
src/main/java/org/bukkit/craftbukkit/Spigot.java | 18 +
src/main/java/org/spigotmc/Metrics.java | 645 +++++++++++++++++++++++
2 files changed, 663 insertions(+)
create mode 100644 src/main/java/org/spigotmc/Metrics.java
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 705daef..b00c885 100644

11
CraftBukkit-Patches/0025-Watchdog-Thread.patch
View File

@ -1,17 +1,8 @@
From 4372dc651d7320403d3080cc3b381122b14ccf68 Mon Sep 17 00:00:00 2001
From b2a6b2e43bbfb724b5b14d53a05eb6a9b46d451e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
---
.../java/net/minecraft/server/MinecraftServer.java | 2 +
src/main/java/org/bukkit/craftbukkit/Spigot.java | 124 +++++++++++++++++----
src/main/java/org/spigotmc/RestartCommand.java | 23 ++++
src/main/java/org/spigotmc/WatchdogThread.java | 93 ++++++++++++++++
src/main/resources/configurations/bukkit.yml | 3 +
5 files changed, 223 insertions(+), 22 deletions(-)
create mode 100644 src/main/java/org/spigotmc/RestartCommand.java
create mode 100644 src/main/java/org/spigotmc/WatchdogThread.java
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 16b15df..4a9d711 100644

31
CraftBukkit-Patches/0026-Netty.patch
View File

@ -1,4 +1,4 @@
From e39b946281f9075dbc5fbca03699a88069717b68 Mon Sep 17 00:00:00 2001
From 591d89bd222a5e52f2dab0bf93e7df8f861cee29 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 14 Feb 2013 17:32:20 +1100
Subject: [PATCH] Netty
@ -30,35 +30,6 @@ Subject: [PATCH] Netty
as well as various other side benefits such as chat thread pooling and a
slight reduction in latency. This commit is licensed under the Creative
Commons Attribution-ShareAlike 3.0 Unported license.
---
pom.xml | 5 +
.../java/net/minecraft/server/DedicatedServer.java | 8 +-
.../java/net/minecraft/server/INetworkManager.java | 26 +++
.../java/net/minecraft/server/NetworkManager.java | 4 +-
.../net/minecraft/server/Packet51MapChunk.java | 2 +-
.../net/minecraft/server/Packet56MapChunkBulk.java | 2 +-
.../net/minecraft/server/PendingConnection.java | 11 +-
.../net/minecraft/server/ThreadCommandReader.java | 1 +
.../net/minecraft/server/ThreadLoginVerifier.java | 1 +
.../craftbukkit/scheduler/CraftScheduler.java | 2 +-
src/main/java/org/spigotmc/netty/CipherCodec.java | 49 ++++
.../org/spigotmc/netty/NettyNetworkManager.java | 235 +++++++++++++++++++
.../org/spigotmc/netty/NettyServerConnection.java | 109 +++++++++
.../org/spigotmc/netty/NettySocketAdaptor.java | 248 +++++++++++++++++++++
.../java/org/spigotmc/netty/PacketDecoder.java | 64 ++++++
.../java/org/spigotmc/netty/PacketEncoder.java | 43 ++++
.../java/org/spigotmc/netty/PacketListener.java | 100 +++++++++
src/main/java/org/spigotmc/netty/ReadState.java | 16 ++
18 files changed, 917 insertions(+), 9 deletions(-)
create mode 100644 src/main/java/net/minecraft/server/INetworkManager.java
create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java
create mode 100644 src/main/java/org/spigotmc/netty/NettyNetworkManager.java
create mode 100644 src/main/java/org/spigotmc/netty/NettyServerConnection.java
create mode 100644 src/main/java/org/spigotmc/netty/NettySocketAdaptor.java
create mode 100644 src/main/java/org/spigotmc/netty/PacketDecoder.java
create mode 100644 src/main/java/org/spigotmc/netty/PacketEncoder.java
create mode 100644 src/main/java/org/spigotmc/netty/PacketListener.java
create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java
diff --git a/pom.xml b/pom.xml
index fce45f8..55e6dc0 100644

7
CraftBukkit-Patches/0027-Enable-Improved-ping-sending.patch
View File

@ -1,13 +1,8 @@
From 3ac9bc9e8f157872fff48338807a29ae2a2093e3 Mon Sep 17 00:00:00 2001
From 751dab285d5f6ad4253afdfe4f427a609517fbbd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved ping sending
---
src/main/java/net/minecraft/server/EntityPlayer.java | 1 +
src/main/java/net/minecraft/server/PlayerList.java | 16 ++++++++++++++++
src/main/resources/configurations/bukkit.yml | 1 +
3 files changed, 18 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 410148f..0c36785 100644

5
CraftBukkit-Patches/0028-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
View File

@ -1,12 +1,9 @@
From a9fdf1fb10b2929099a0801a16b7e2afdd084077 Mon Sep 17 00:00:00 2001
From 004df3a6c801a353c88d75ff4ef6d631cbf0cce5 Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Fri, 22 Feb 2013 09:23:51 -0700
Subject: [PATCH] Return bed location itself instead of next to bed; Fixes
BUKKIT-3604
---
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5b74a5b..a913a1c 100644

5
CraftBukkit-Patches/0029-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
View File

@ -1,12 +1,9 @@
From df26ba7e91b1fb951e4649f579812acf537b225d Mon Sep 17 00:00:00 2001
From 5f3f7d223e2d45887573af03dcd9e208874ecc9f Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Tue, 12 Feb 2013 16:17:31 -0700
Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
BUKKIT-3604
---
src/main/java/net/minecraft/server/PlayerList.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index eb3e7a4..f94cc54 100644

5
CraftBukkit-Patches/0030-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
View File

@ -1,12 +1,9 @@
From 0e94cb04fd0f2a6c99cf935a76238ea755bc42a1 Mon Sep 17 00:00:00 2001
From 29d82480eaedef3660ef53216a027dca06cf136e Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Sat, 2 Mar 2013 09:36:52 +1100
Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when
EntityHanging moves
---
src/main/java/net/minecraft/server/EntityHanging.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
index f697d85..1dfb02f 100644

5
CraftBukkit-Patches/0031-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
View File

@ -1,11 +1,8 @@
From a8a242d91159293255e7554f55c4a8dd038915f4 Mon Sep 17 00:00:00 2001
From fb04e2f8c99e6fa036b84be52e23b02b8d61f90d Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Mon, 25 Feb 2013 22:26:36 +0200
Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally
---
src/main/java/net/minecraft/server/EntityPlayer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0c36785..3ce9f8b 100644

5
CraftBukkit-Patches/0032-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
View File

@ -1,12 +1,9 @@
From eddd098c9ca459d6be96a9ba9f419973947c9483 Mon Sep 17 00:00:00 2001
From 37a00bc03a7f768aeb1c8367299b0fe5963e5495 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Tue, 26 Feb 2013 20:14:34 +0200
Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when
filling empty bucket
---
src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java
index 8f7e09b..ae65526 100644

5
CraftBukkit-Patches/0033-PlayerItemDamageEvent.patch
View File

@ -1,11 +1,8 @@
From 2989643c7c29bdd67a68d0285c7a7269dcef703d Mon Sep 17 00:00:00 2001
From cef07032eb0f842a3bf3eca993c1e2e96577d1b9 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
---
src/main/java/net/minecraft/server/ItemStack.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 7dc36a8..cd032ae 100644

5
CraftBukkit-Patches/0034-Faster-UUID-for-entities.patch
View File

@ -1,12 +1,9 @@
From 8946198a7009f0a3f35c0a4d6c049b83a4b4bf21 Mon Sep 17 00:00:00 2001
From 39127f9cade7372cad29c50fdafb2c5eea11b0a5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
---
src/main/java/net/minecraft/server/Entity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 482fecb..52ecc09 100644

5
CraftBukkit-Patches/0035-Prevent-NPE-in-CraftSign.patch
View File

@ -1,12 +1,9 @@
From 94e7104419f58583786b4b0d894fa642c05f68f3 Mon Sep 17 00:00:00 2001
From d5554a2530aeb3d902568c8322958ebd5682bd29 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 18 Mar 2013 20:01:44 +1100
Subject: [PATCH] Prevent NPE in CraftSign
This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().
---
src/main/java/org/bukkit/craftbukkit/block/CraftSign.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
index 1647100..43c4434 100644

8
CraftBukkit-Patches/0036-Stage-DataWatcher-WatchableObject.patch
View File

@ -1,15 +1,9 @@
From 2b04a672e68b9f131c384964788e80b4d5344b17 Mon Sep 17 00:00:00 2001
From a29d0342ea74fe128d8426b2c921d91d5d9c67c2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 21 Mar 2013 17:00:54 +1100
Subject: [PATCH] Stage DataWatcher & WatchableObject.
So that we may identify the exact cause of exceptions originating from these classes.
---
.../java/net/minecraft/server/DataWatcher.java | 287 +++++++++++++++++++++
.../java/net/minecraft/server/WatchableObject.java | 44 ++++
2 files changed, 331 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/DataWatcher.java
create mode 100644 src/main/java/net/minecraft/server/WatchableObject.java
diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
new file mode 100644

8
CraftBukkit-Patches/0037-Entity-Tracking-Ranges.patch
View File

@ -1,4 +1,4 @@
From 9c8bc24c6b42dfee69e63cc54936e014ab0811a5 Mon Sep 17 00:00:00 2001
From bb5b98566ebcbdd63ca9d1729d66767922eb4210 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
@ -10,12 +10,6 @@ This has multiple benefits:
2) Less lag by maps in item frames - Default range is 160 blocks... Many players can track that item frame and cause lag and not even see it.
3) Less lag in general - Less work for the server to do
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.
---
.../java/net/minecraft/server/EntityTracker.java | 1 +
.../java/org/bukkit/craftbukkit/CraftWorld.java | 22 ++++++++++++++++++
src/main/java/org/bukkit/craftbukkit/Spigot.java | 26 ++++++++++++++++++++++
src/main/resources/configurations/bukkit.yml | 5 +++++
4 files changed, 54 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index db62084..32ce51d 100644

7
CraftBukkit-Patches/0038-BungeeCord-Support.patch
View File

@ -1,14 +1,9 @@
From bcbd1c101a4551ad61f50a7251c9720976558389 Mon Sep 17 00:00:00 2001
From c309d1fe6d2ecd6340605ecc218bc7937ec4a329 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
- Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
---
src/main/java/net/minecraft/server/PendingConnection.java | 13 +++++++++++++
src/main/java/org/bukkit/craftbukkit/Spigot.java | 2 ++
src/main/resources/configurations/bukkit.yml | 2 ++
3 files changed, 17 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index fcfc3d2..3448fc5 100644

8
CraftBukkit-Patches/0039-Texture-Pack-Resolutions.patch
View File

@ -1,15 +1,9 @@
From 3b6a61f47c2b784c95ddfd425b9e316501b197f2 Mon Sep 17 00:00:00 2001
From 48f767873e99e1669e5a416a5ab4e10868310637 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:04:45 +1100
Subject: [PATCH] Texture Pack Resolutions
Fix issues when specifiying a server texture pack URL with resolution != 16.
---
src/main/java/net/minecraft/server/MinecraftServer.java | 2 +-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 2 ++
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +-
src/main/resources/configurations/bukkit.yml | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4a9d711..8e02ca4 100644

5
CraftBukkit-Patches/0040-Entity-Tracking-Intervals.patch
View File

@ -1,12 +1,9 @@
From 2667f7b024551bd022ac65e8aa51c54987d82a37 Mon Sep 17 00:00:00 2001
From 8bb196c53f5128685dcbc47266ccb6b920a34271 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:31:23 +1100
Subject: [PATCH] Entity Tracking Intervals
Send boats at the same speed as their player to remove the illusion of lag / jerkiness.
---
src/main/java/net/minecraft/server/EntityTracker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 32ce51d..7cd2c26 100644

6
CraftBukkit-Patches/0041-Limit-Custom-Map-Rendering.patch
View File

@ -1,13 +1,9 @@
From be05138f3a265c2cd9cf7a659ad80eadfda26327 Mon Sep 17 00:00:00 2001
From 9b5abad12b525d3b0b7789e60e6b9fa26fca6ebf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 19:08:41 +1100
Subject: [PATCH] Limit Custom Map Rendering
The default CraftBukkit render sequence for maps is ridiculously slow. By only using it when a custom renderer has been added (rarely in most cases), we can fallback to the Vanilla renderer for general usage. This leads to a much higher effiency overall, especially if no plugins are rendering such maps.
---
.../net/minecraft/server/WorldMapHumanTracker.java | 24 ++++++++++++++--------
.../org/bukkit/craftbukkit/map/CraftMapView.java | 2 +-
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldMapHumanTracker.java b/src/main/java/net/minecraft/server/WorldMapHumanTracker.java
index bf3e6fe..305dceb 100644

5
CraftBukkit-Patches/0042-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
View File

@ -1,13 +1,10 @@
From 50417be2c7a2ff1441f6b9ea0c64cd3434077307 Mon Sep 17 00:00:00 2001
From 9f52a3d9490dbec19402662bbb36b262ad48d954 Mon Sep 17 00:00:00 2001
From: Hudson <hudson@mydomain.com>
Date: Wed, 3 Apr 2013 02:16:56 -0500
Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes
BUKKIT-3951"
This reverts commit 052e955ed71a30516a5e9cfd76649daaba4ae7d8.
---
src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index a30f217..35badf3 100644

5
CraftBukkit-Patches/0043-Boat-dupe-fix.patch
View File

@ -1,11 +1,8 @@
From 77faf8b96acde1a57bbb78ee1fed086af6ef2066 Mon Sep 17 00:00:00 2001
From 61037af4ec77e980df5cd7eba2e3af253da713bf Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Fri, 5 Apr 2013 18:13:35 +0100
Subject: [PATCH] Boat dupe fix.
---
src/main/java/net/minecraft/server/EntityBoat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 8839a45..953e86c 100644

2
rebuildPatches.sh
View File

@ -24,7 +24,7 @@ function savePatches {
what=$1
target=$2
cd $basedir/$target/
git format-patch -N -o $basedir/${what}-Patches/ upstream/upstream
git format-patch --no-stat -N -o $basedir/${what}-Patches/ upstream/upstream
cd $basedir
git add $basedir/${what}-Patches
cleanupPatches $basedir/${what}-Patches