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

Merge pull request #24 from TehRainbowGuy/master 

Updates spigot to 1.5.1
This commit is contained in:
md-5 2013-03-20 15:53:34 -07:00
parent e4418a5080 49fd03bf60
commit 625e03fb5f
46 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 9e39ff7492b224e9013bb8edf0d9b4b14af64936 Mon Sep 17 00:00:00 2001
From e480c1604c30348befec70e418fa12b3257165d8 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.
@ -8,7 +8,7 @@ Subject: [PATCH] Spigot POM Changes.
1 file changed, 12 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 059093b..f547613 100644
index 2df4906..9d986fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@ -26,7 +26,7 @@ index 059093b..f547613 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.5-R0.1-SNAPSHOT</version>
<version>1.5.1-R0.1-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>
@ -68,5 +68,5 @@ index 059093b..f547613 100644
<plugins>
<plugin>
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From a1e1f7ed9dab3b4b7889ae54120fc1e24ccb0c12 Mon Sep 17 00:00:00 2001
From 6799cb6eaa5c2f6d572ec20968f5f08d70137e04 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.
@ -41,7 +41,7 @@ index 29ebbe0..94cd62c 100644
if (separate) sender.sendMessage("Names written to " + names.getPath());
} catch (IOException e) {
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index d4f6bf3..4049d3a 100644
index 8224d29..2527e71 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -23,6 +23,7 @@ import org.bukkit.Server;
@ -61,5 +61,5 @@ index d4f6bf3..4049d3a 100644
}
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From 1d2352eb83a0e0cd6ff7cd592999430d37a8513a Mon Sep 17 00:00:00 2001
From 0e45136a44feead58a7f28c99c58e6c39938c0f9 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
@ -394,7 +394,7 @@ index ed25e17..47dab3e 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 10fc26a..9c7288e 100644
index ea30d83..d905435 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -430,7 +430,7 @@ public class JavaPluginLoader implements PluginLoader {
@ -407,5 +407,5 @@ index 10fc26a..9c7288e 100644
} else {
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
--
1.8.1.1
1.8.2

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

@ -1,4 +1,4 @@
From dfaa3f1f815be47081b741181b2f4e9ab400f437 Mon Sep 17 00:00:00 2001
From 767ad529f592e2721f2df2c14f533317eab3ff7c 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.
@ -26,5 +26,5 @@ index 29ec3fc..a31500c 100644
if (result == null) {
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From 9df4bf49783c57d5e7e358a3a895f601bcf7aa30 Mon Sep 17 00:00:00 2001
From aa48bcce71642e31b6a9447113439c885fbd560d 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
@ -69,5 +69,5 @@ index 0000000..38a72ab
+ }
+}
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From a79a8eef650434b3171e78bf2d3fd9741c5d076a Mon Sep 17 00:00:00 2001
From 7962cbdf9cabf92d4f3475e5fe71c0d006e5035a 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.
@ -8,7 +8,7 @@ Subject: [PATCH] POM Changes.
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5a74ee9..026700f 100644
index ce239ff..8f2e071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@ -28,7 +28,7 @@ index 5a74ee9..026700f 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.5-R0.1-SNAPSHOT</version>
<version>1.5.1-R0.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@ -37,7 +37,7 @@ index 5a74ee9..026700f 100644
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,25 +24,6 @@
<minecraft_version>1_5_R1</minecraft_version>
<minecraft_version>1_5_R2</minecraft_version>
</properties>
- <scm>
@ -120,5 +120,5 @@ index 5a74ee9..026700f 100644
<execution>
<phase>package</phase>
--
1.8.1-rc2
1.8.2

16
CraftBukkit-Patches/0002-Spigot-changes.patch
View File

@ -1,4 +1,4 @@
From 3e3baa72093f845274f47c79673beccc1b081e35 Mon Sep 17 00:00:00 2001
From e487f4eb5d39d9f09a9ffa5dafa8354d94115169 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 16 Mar 2013 10:13:29 +1100
Subject: [PATCH] Spigot changes.
@ -347,7 +347,7 @@ index ee775bf..aa8d83f 100644
if (!this.world.isStatic && this.age >= 6000) {
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 30259de..af42142 100644
index 58a8110..c000125 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -63,10 +63,6 @@ public class EntitySquid extends EntityWaterAnimal {
@ -407,7 +407,7 @@ index 13c2705..9ea4ee6 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d57ff15..a435f67 100644
index 6efb5b6..79c52f6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -304,7 +304,7 @@ public abstract class PlayerList {
@ -467,7 +467,7 @@ index 0686ba0..c185f64 100644
URL url = new URL("http://session.minecraft.net/game/checkserver.jsp?user=" + URLEncoder.encode(PendingConnection.d(this.pendingConnection), "UTF-8") + "&serverId=" + URLEncoder.encode(s, "UTF-8"));
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9c39815..67f2560 100644
index b694789..134ab73 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -67,14 +67,27 @@ public abstract class World implements IBlockAccess {
@ -631,7 +631,7 @@ index 9c39815..67f2560 100644
double d0 = 0.25D;
List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
@@ -1942,6 +2038,11 @@ public abstract class World implements IBlockAccess {
@@ -1946,6 +2042,11 @@ public abstract class World implements IBlockAccess {
this.worldData.setWeatherDuration(1);
}
@ -643,7 +643,7 @@ index 9c39815..67f2560 100644
protected void A() {
// this.chunkTickList.clear(); // CraftBukkit - removed
this.methodProfiler.a("buildList");
@@ -1951,25 +2052,42 @@ public abstract class World implements IBlockAccess {
@@ -1955,25 +2056,42 @@ public abstract class World implements IBlockAccess {
int j;
int k;
@ -700,7 +700,7 @@ index 9c39815..67f2560 100644
this.methodProfiler.b();
if (this.O > 0) {
@@ -1977,7 +2095,7 @@ public abstract class World implements IBlockAccess {
@@ -1981,7 +2099,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");
@ -1225,5 +1225,5 @@ index 61a95e3..f44d5d0 100644
monsters: 70
animals: 15
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From bfc5f88c1e7d5fbe91a141aa18e6491fafd2fd92 Mon Sep 17 00:00:00 2001
From 2b9688df3fbf86e9dfe1acb39eda62ff49d795c7 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
@ -10,7 +10,7 @@ Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when
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 bfcb6ce..552a013 100644
index 1f7b8ad..6f77702 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -5,11 +5,13 @@ import java.util.Iterator;
@ -39,5 +39,5 @@ index bfcb6ce..552a013 100644
}
}
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0004-Update-item-merge-logic.patch
View File

@ -1,4 +1,4 @@
From 2e93b88a60c6455d3c3754c75c788cc705e5b7b3 Mon Sep 17 00:00:00 2001
From fb269cb8e23a35d6356ea849600768b7d137adbd Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:51:07 +1100
Subject: [PATCH] Update item merge logic
@ -8,7 +8,7 @@ Subject: [PATCH] Update item merge logic
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 14df580..d1fe36f 100644
index 134ab73..d78d948 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -948,6 +948,7 @@ public abstract class World implements IBlockAccess {
@ -41,5 +41,5 @@ index 14df580..d1fe36f 100644
}
}
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
View File

@ -1,4 +1,4 @@
From 639bb457b93afa9a2294d94bfd0b75d64d188b98 Mon Sep 17 00:00:00 2001
From 77b8cb1974ea857b889682aa8d455400acb916b9 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 14 Dec 2012 21:51:06 -0600
Subject: [PATCH] Include NibbleArray from mc-dev for diff visibility
@ -55,5 +55,5 @@ index 0000000..5d75a54
+ }
+}
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
View File

@ -1,4 +1,4 @@
From 312e0e8499c59630a87f6784285ce07f80156df9 Mon Sep 17 00:00:00 2001
From 3f7bb734d467c6ae5e7f717d09091f0072a8f8ab 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
@ -17,7 +17,7 @@ Fix nibble handling with NBT - arrays aren't copied by NBTByteArray
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 e5e60a9..2e72ab5 100644
index c1f5cc2..bf6a9ae 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -225,15 +225,15 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
@ -385,5 +385,5 @@ index c3b9113..e34e781 100644
}
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch
View File

@ -1,4 +1,4 @@
From 01d137f66a7e0e3c2288742a19fc7c56028525b2 Mon Sep 17 00:00:00 2001
From 5b1786bcc9f2bd9638adf0cfd076981a138ab2ae Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Mon, 7 Jan 2013 09:57:30 +1100
Subject: [PATCH] Return LOHS to full operation.
@ -26,5 +26,5 @@ index 3f1617d..a1250d3 100644
int index = (hash & 0x7FFFFFFF) % values.length;
int offset = 1;
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0008-Per-world-view-distance.patch
View File

@ -1,4 +1,4 @@
From e675b284d269749d323c7018995e71807520d700 Mon Sep 17 00:00:00 2001
From 3c5dece19abe1d7cdc329f0520507cdc228ac9a6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sat, 12 Jan 2013 19:57:45 +1100
Subject: [PATCH] Per world view distance.
@ -65,5 +65,5 @@ index f44d5d0..0c92b66 100644
random-light-updates: true
water-creatures-per-chunk: 0
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0009-Fix-various-crop-growth-modifier-formula-issues.patch
View File

@ -1,4 +1,4 @@
From 07d43f2d51a94bbe84912b1f13353185f7089f27 Mon Sep 17 00:00:00 2001
From 944c9cf3316f1961ddeadbcd2b6dd87ae0b9ef39 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Jan 2013 11:08:45 -0500
Subject: [PATCH] Fix various crop growth modifier formula issues
@ -107,5 +107,5 @@ index a945ee4..c17ce36 100644
if (l < 7) {
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
View File

@ -1,4 +1,4 @@
From 5403a45cb37298605612b7b059ea963a09afa453 Mon Sep 17 00:00:00 2001
From 6736c6beeaf81c42417d2b70316a4d9497796631 Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:41:38 -0800
Subject: [PATCH] Add OldChunkLoader from mc-dev for diff visibility
@ -136,5 +136,5 @@ index 0000000..65b0b70
+}
\ No newline at end of file
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
View File

@ -1,4 +1,4 @@
From 69eceb5d0258629d174e17d5a8e3547e196e2138 Mon Sep 17 00:00:00 2001
From 5156a810ad9b2fc85ce8145089b0b7264f4359aa 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
@ -27,5 +27,5 @@ index 65b0b70..0b3bd0d 100644
}
}
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From c202dc309048355e8243da6950dc27bbf2753ac9 Mon Sep 17 00:00:00 2001
From f08eb8edd56e05b7d43deffd5bcd2f4caaaeedfb 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.
@ -21,5 +21,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From 2510ee47cc0bc0a9dc98effad61b9e8835192235 Mon Sep 17 00:00:00 2001
From 9aed14ce3aea2598f458a7fc7cffa3df5c777a41 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
@ -52,5 +52,5 @@ index 5350644..185a609 100644
entityplayer.chunkCoordIntPairQueue.remove(this.location);
if (this.b.isEmpty()) {
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From b27c7c335908980afecc8fcb517c4dc5db2fa2f7 Mon Sep 17 00:00:00 2001
From cf02ddea09cb72c52bb42a66c8fd70ec0726de4c 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.
@ -8,7 +8,7 @@ Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
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 b9667a0..0dc65e6 100644
index 2e7cb43..fabe3ab 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -430,6 +430,7 @@ public abstract class Entity {
@ -20,5 +20,5 @@ index b9667a0..0dc65e6 100644
this.boundingBox.d(d0, d1, d2);
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From c247b6e15e2155da6e60e7993db6f297675d67bb Mon Sep 17 00:00:00 2001
From 1222e0b3be125bf5cabb00b3df7df8922862e27f 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
@ -8,7 +8,7 @@ Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache
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 d1fe36f..c398268 100644
index d78d948..9b4cc07 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -294,15 +294,13 @@ public abstract class World implements IBlockAccess {
@ -34,5 +34,5 @@ index d1fe36f..c398268 100644
}
// CraftBukkit end
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From ee32c90960abad2b5ea24ffc467b4adf4a01e506 Mon Sep 17 00:00:00 2001
From 98acdcd33169b89021c3f821446f5b91f48e477b 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.
@ -11,7 +11,7 @@ Subject: [PATCH] Tick loop optimization - sleep for as long as possible.
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 d3f3f86..d363643 100644
index 5c535cc..43b5d96 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -85,6 +85,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -136,5 +136,5 @@ index 0000000..f114a31
+ }
+}
--
1.8.1-rc2
1.8.2

26
CraftBukkit-Patches/0017-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From bf102bce710e53f82e2d43cef32df65bb5887bd7 Mon Sep 17 00:00:00 2001
From 880ea9bc4fc136931a5a93eff3e88291503cef3f 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
@ -39,7 +39,7 @@ index d5887a9..3772ad8 100644
// CraftBukkit start - If we didn't need to load the chunk run the callback now
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0dc65e6..c68e9cf 100644
index fabe3ab..ccc4858 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@ -76,10 +76,10 @@ index 0dc65e6..c68e9cf 100644
protected void C() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 27b2ce2..103ab2c 100644
index 15fbf69..350560e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -512,6 +512,7 @@ public abstract class EntityLiving extends Entity {
@@ -513,6 +513,7 @@ public abstract class EntityLiving extends Entity {
}
public void l_() {
@ -87,7 +87,7 @@ index 27b2ce2..103ab2c 100644
super.l_();
if (!this.world.isStatic) {
int i;
@@ -538,7 +539,9 @@ public abstract class EntityLiving extends Entity {
@@ -539,7 +540,9 @@ public abstract class EntityLiving extends Entity {
}
}
@ -97,7 +97,7 @@ index 27b2ce2..103ab2c 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -629,6 +632,7 @@ public abstract class EntityLiving extends Entity {
@@ -630,6 +633,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.aE += f2;
@ -105,7 +105,7 @@ index 27b2ce2..103ab2c 100644
}
// CraftBukkit start - delegate so we can handle providing a reason for health being regained
@@ -1264,6 +1268,7 @@ public abstract class EntityLiving extends Entity {
@@ -1265,6 +1269,7 @@ public abstract class EntityLiving extends Entity {
}
public void c() {
@ -113,7 +113,7 @@ index 27b2ce2..103ab2c 100644
if (this.bX > 0) {
--this.bX;
}
@@ -1315,6 +1320,7 @@ public abstract class EntityLiving extends Entity {
@@ -1316,6 +1321,7 @@ public abstract class EntityLiving extends Entity {
this.aA = this.yaw;
}
}
@ -121,7 +121,7 @@ index 27b2ce2..103ab2c 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -1333,6 +1339,7 @@ public abstract class EntityLiving extends Entity {
@@ -1334,6 +1340,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.world.methodProfiler.a("travel");
@ -129,7 +129,7 @@ index 27b2ce2..103ab2c 100644
this.bD *= 0.98F;
this.bE *= 0.98F;
this.bF *= 0.9F;
@@ -1341,11 +1348,14 @@ public abstract class EntityLiving extends Entity {
@@ -1342,11 +1349,14 @@ public abstract class EntityLiving extends Entity {
this.aO *= this.bE();
this.e(this.bD, this.bE);
this.aO = f;
@ -145,7 +145,7 @@ index 27b2ce2..103ab2c 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("looting");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d363643..bbad047 100644
index 43b5d96..28135f4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -6,7 +6,6 @@ import java.security.KeyPair;
@ -279,7 +279,7 @@ index db3fc42..174546d 100644
private static Map b = new HashMap();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 53627a8..4db8a5b 100644
index 9b4cc07..b5c5e36 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@ -566,5 +566,5 @@ index 55db3ff..df134e3 100644
long getPeriod() {
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0018-Better-more-flexible-itemstack-merging.patch
View File

@ -1,4 +1,4 @@
From 8379b6c5ada2d27070c6dc223accf351f190a3a6 Mon Sep 17 00:00:00 2001
From a4b236f3fce26060a2a4751d6fa0f113c6cc75e6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 25 Jan 2013 18:24:54 +1100
Subject: [PATCH] Better + more flexible itemstack merging
@ -40,7 +40,7 @@ index aa8d83f..bc69f5d 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d1be7c3..5cf6bc6 100644
index b5c5e36..ba37de6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -948,31 +948,8 @@ public abstract class World implements IBlockAccess {
@ -89,5 +89,5 @@ index d1be7c3..5cf6bc6 100644
event = CraftEventFactory.callProjectileLaunchEvent(entity);
}
--
1.8.1-rc2
1.8.2

8
CraftBukkit-Patches/0019-Add-oreobfuscator-for-Spigot.patch
View File

@ -1,4 +1,4 @@
From 7e3f05017b31d259c4f88ef191b69f78f0a1ef10 Mon Sep 17 00:00:00 2001
From 3d2f20e91ddbd6900e05d1f3437c17c1b4c88d4c Mon Sep 17 00:00:00 2001
From: lishid <lishid@gmail.com>
Date: Sat, 16 Feb 2013 10:05:25 +1100
Subject: [PATCH] Add oreobfuscator for Spigot.
@ -30,7 +30,7 @@ index 96120d8..0707d23 100644
if (this.onGround) {
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index aa3ae58..2d0aaa3 100644
index 50646ce..7279631 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -240,6 +240,7 @@ public class Explosion {
@ -123,7 +123,7 @@ index 92e68be..62df1a3 100644
if (false) { // Never trigger
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8f65601..16460b6 100644
index 872c4ac..83704f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -163,6 +163,12 @@ public final class CraftServer implements Server {
@ -354,5 +354,5 @@ index 0c92b66..78e9a66 100644
+ disabled-worlds:
+ - world_the_end
--
1.8.1-rc2
1.8.2

8
CraftBukkit-Patches/0020-Reduce-number-of-LivingEntity-collision-checks.patch
View File

@ -1,4 +1,4 @@
From 5cf1d81fb59b7d6941a6b5e502dcbcb7211fb32f Mon Sep 17 00:00:00 2001
From a50f07af29ceeee1bdf4375e1b1b0a9372953fa7 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Reduce number of LivingEntity collision checks.
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 89ce129..86a0b6d 100644
index 350560e..84a2926 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1427,12 +1427,20 @@ public abstract class EntityLiving extends Entity {
@@ -1428,12 +1428,20 @@ public abstract class EntityLiving extends Entity {
}
protected void bg() {
@ -33,5 +33,5 @@ index 89ce129..86a0b6d 100644
this.o(entity);
}
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From 2d146ed5859c06f1b74d68a256a9b2a72d7445a5 Mon Sep 17 00:00:00 2001
From 576baf32ba8f8bdef7637a1e1340ff2519fcfc2e 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
@ -105,5 +105,5 @@ index 2d1a372..de8f065 100644
continue label110;
}
--
1.8.1-rc2
1.8.2

10
CraftBukkit-Patches/0022-Only-send-maps-in-item-frames-upon-tracking.patch
View File

@ -1,4 +1,4 @@
From 8aef49550dffe98eab42122dda445d090f7770cb Mon Sep 17 00:00:00 2001
From 130f626d68eefe347da48013f7fc856637da2ff2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Feb 2013 17:26:20 -0500
Subject: [PATCH] Only send maps in item frames upon tracking
@ -15,7 +15,7 @@ This means cursors will not dynamically update, but the map data should refresh
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 4948f23..45e469a 100644
index ae9ed52..6fa425c 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -36,6 +36,7 @@ public class EntityTrackerEntry {
@ -58,7 +58,7 @@ index 4948f23..45e469a 100644
}
}
}
@@ -330,6 +331,17 @@ public class EntityTrackerEntry {
@@ -332,6 +333,17 @@ public class EntityTrackerEntry {
}
}
@ -76,7 +76,7 @@ index 4948f23..45e469a 100644
if (this.tracker instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) this.tracker;
@@ -356,6 +368,7 @@ public class EntityTrackerEntry {
@@ -358,6 +370,7 @@ public class EntityTrackerEntry {
}
} else if (this.trackedPlayers.contains(entityplayer)) {
this.trackedPlayers.remove(entityplayer);
@ -85,5 +85,5 @@ index 4948f23..45e469a 100644
}
}
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From df7aaaaa25ae229a755ffadd32308cab505e3313 Mon Sep 17 00:00:00 2001
From fb878d2b3c47d315ec5f7e996a13e0f482346edd 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.
@ -8,7 +8,7 @@ Subject: [PATCH] Detect, remove and warn about null tile entities.
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 5cf6bc6..4b6c910 100644
index ba37de6..2a5c60e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1332,6 +1332,13 @@ public abstract class World implements IBlockAccess {
@ -26,5 +26,5 @@ index 5cf6bc6..4b6c910 100644
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
--
1.8.1-rc2
1.8.2

16
CraftBukkit-Patches/0024-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From d78fe7a23cc168df381cd729ba08886b26c10fb2 Mon Sep 17 00:00:00 2001
From 037bd973e2b44ad4421765c49603b4cef7594746 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
@ -19,15 +19,15 @@ This change can have dramatic impact on gameplay if configured too low. Balance
8 files changed, 263 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c68e9cf..9e5ce4b 100644
index ccc4858..24ab35f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -89,7 +89,7 @@ public abstract class Entity {
public int ticksLived;
public int maxFireTicks;
public int fireTicks; // CraftBukkit - private -> public
- protected boolean ae;
+ public boolean ae; // Spigot - private -> public isInWater - If this renames, update Spigot.checkEntityImmunities
- protected boolean inWater;
+ public boolean inWater; // Spigot - protected -> public
public int noDamageTicks;
private boolean justCreated;
protected boolean fireProof;
@ -89,7 +89,7 @@ index bc69f5d..430dd79 100644
// CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 24de0c7..a97649e 100644
index 2a5c60e..9f7eea6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@ -174,7 +174,7 @@ index 38e551b..813f662 100644
public Block getBlockAt(int x, int y, int z) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index ad65bca..ee0fdbf 100644
index ad65bca..8012ff8 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,9 +1,17 @@
@ -346,7 +346,7 @@ index ad65bca..ee0fdbf 100644
+ */
+ public static boolean checkEntityImmunities(Entity entity) {
+ // quick checks.
+ if (entity.ae /* isInWater */ || entity.fireTicks > 0) {
+ if (entity.inWater /* isInWater */ || entity.fireTicks > 0) {
+ return true;
+ }
+ if (!(entity instanceof EntityArrow)) {
@ -441,5 +441,5 @@ index 78e9a66..e568bf6 100644
growth-chunks-per-tick: 1000
world_nether:
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0025-Optimize-getTileEntities-performance.patch
View File

@ -1,4 +1,4 @@
From 8bdcad4ea2c020e2e5aa5211f734e1695bf7712b Mon Sep 17 00:00:00 2001
From e73e29270b3d9279e479e33311e075c8d45e85b0 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
@ -43,5 +43,5 @@ index 836da20..177fa94 100644
return arraylist;
}
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0026-Improved-tile-entity-lookup-for-chunk-sending.patch
View File

@ -1,4 +1,4 @@
From 816a0dcc3e94acb08b671715e0f29113bc2977d6 Mon Sep 17 00:00:00 2001
From 97eec6581627bdf80b2a93870f9ebe70e619e46c 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
@ -10,7 +10,7 @@ This results in a good reduction of time spent in player ticking.
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 03140c2..0905964 100644
index 573c0f0..e6c5f91 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -173,8 +173,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -26,5 +26,5 @@ index 03140c2..0905964 100644
}
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0027-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
View File

@ -1,4 +1,4 @@
From 0c7281c1c384feea1e64b2f4ae234ef473f6f4be Mon Sep 17 00:00:00 2001
From 88936d72c341a57f45f02a9a318b796c81737303 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
@ -11,7 +11,7 @@ Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the
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 79be52d..e083480 100644
index 8012ff8..8df3ca5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,11 +1,16 @@
@ -711,5 +711,5 @@ index 0000000..f1690a2
+}
\ No newline at end of file
--
1.8.1-rc2
1.8.2

8
CraftBukkit-Patches/0028-Watchdog-Thread.patch
View File

@ -1,4 +1,4 @@
From 76c7a62e5fdd044a952baf0d6fd53dc7b6cd5515 Mon Sep 17 00:00:00 2001
From f73e4d9100de1627a3f0068f37ac6bfd071fe117 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.
@ -14,7 +14,7 @@ Subject: [PATCH] Watchdog Thread.
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 e8620d5..6d8b89a 100644
index 28135f4..3689a3d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -403,6 +403,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -34,7 +34,7 @@ index e8620d5..6d8b89a 100644
this.isStopped = true;
} catch (Throwable throwable1) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index e083480..6713281 100644
index 8df3ca5..4b355c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,5 +1,6 @@
@ -297,5 +297,5 @@ index e568bf6..7c18391 100644
default:
growth-chunks-per-tick: 650
--
1.8.1-rc2
1.8.2

8
CraftBukkit-Patches/0029-Netty.patch
View File

@ -1,4 +1,4 @@
From d92bd63ca5f55a56d7dea9b023dbf03ea46066ca Mon Sep 17 00:00:00 2001
From 825efa77fe7ac52d93d638df830857e12917f7ab 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
@ -60,7 +60,7 @@ Subject: [PATCH] Netty
create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java
diff --git a/pom.xml b/pom.xml
index e04acf9..bd4d85f 100644
index 8f2e071..73c676a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,11 @@
@ -76,7 +76,7 @@ index e04acf9..bd4d85f 100644
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index f985c05..70d05a6 100644
index bd7e41c..c189b1b 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -1140,5 +1140,5 @@ index 0000000..5dc3754
+ DATA;
+}
--
1.8.1-rc2
1.8.2

8
CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch
View File

@ -1,4 +1,4 @@
From 7447395e42bf44b8d0e3bc90180c60059d68ede0 Mon Sep 17 00:00:00 2001
From 253c585bd6a3087f5b45442bbfd87de29d4c02ac 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
@ -10,7 +10,7 @@ Subject: [PATCH] Enable Improved ping sending
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 0905964..02637a3 100644
index e6c5f91..bd8dfa7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -22,7 +22,7 @@ index 0905964..02637a3 100644
public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a435f67..240c992 100644
index 79c52f6..c6513c8 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -714,7 +714,23 @@ public abstract class PlayerList {
@ -62,5 +62,5 @@ index 7c18391..aac1406 100644
restart-on-crash: false
restart-script-location: /path/to/server/start.sh
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0031-View-distance.patch
View File

@ -1,4 +1,4 @@
From c21493df1c0843aeee5dc87d7f4d41637719d153 Mon Sep 17 00:00:00 2001
From 3637adf9a4f3398138756799a7c91b94226e435b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 26 Feb 2013 11:31:27 +1100
Subject: [PATCH] View distance.
@ -22,5 +22,5 @@ index f788a62..98d6dd2 100644
} else {
this.e = i;
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From bf63fe669bec271a0e5ae5a6287a6255f46b8568 Mon Sep 17 00:00:00 2001
From 9662ff2f057b8d52bb4446f34979c201c6ec4dc7 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
@ -44,5 +44,5 @@ index 1871d3e..2e58bf0 100644
return null;
}
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
View File

@ -1,4 +1,4 @@
From bafed8697ae6b48f23f2befd5e44bb2f9724628a Mon Sep 17 00:00:00 2001
From 808e35b72cc0f8ed679f0d1cfee555091166d02f 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
@ -9,7 +9,7 @@ Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 240c992..16216e2 100644
index c6513c8..ae7ed8f 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -491,8 +491,15 @@ public abstract class PlayerList {
@ -31,5 +31,5 @@ index 240c992..16216e2 100644
exit = exitWorld.getWorld().getSpawnLocation();
}
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0034-Identify-outside-slot-independent-of-inventory-type-.patch
View File

@ -1,4 +1,4 @@
From e91df993c0de872acdd4d6bdb3d96780f6120874 Mon Sep 17 00:00:00 2001
From 3c8e332b0453faec191720e8a005918d5e6d3b33 Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Thu, 21 Feb 2013 14:22:09 -0700
Subject: [PATCH] Identify outside slot independent of inventory type; Fixes
@ -22,5 +22,5 @@ index 6ffc73d..1c7934d 100644
case FURNACE:
if (slot == 2) {
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0035-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
View File

@ -1,4 +1,4 @@
From c5ab6f754ba26bbca5bbddcbfcb666ab91797a47 Mon Sep 17 00:00:00 2001
From 9284fdc8f737fa0329e3d91631fead95ce9c817a 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
@ -9,7 +9,7 @@ Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when
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 8cc80b9..77f9c76 100644
index c35a88a..f88d337 100644
--- a/src/main/java/net/minecraft/server/EntityHanging.java
+++ b/src/main/java/net/minecraft/server/EntityHanging.java
@@ -261,6 +261,21 @@ public abstract class EntityHanging extends Entity {
@ -35,5 +35,5 @@ index 8cc80b9..77f9c76 100644
this.h();
}
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From 56c3478ef0a9a2a7de8223d94b3044ff63cb98ef Mon Sep 17 00:00:00 2001
From b40030724510d611cabe669bbd1efab38a88086c 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
@ -8,7 +8,7 @@ Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally
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 02637a3..fc8797d 100644
index bd8dfa7..ba3fde9 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -423,7 +423,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -21,5 +21,5 @@ index 02637a3..fc8797d 100644
if (this.isSleeping()) {
this.o().getTracker().sendPacketToEntity(this, new Packet18ArmAnimation(this, 3));
--
1.8.1-rc2
1.8.2

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

@ -1,4 +1,4 @@
From b6475416c1cf91bdb1990435118c935f2c1363f9 Mon Sep 17 00:00:00 2001
From 7f5b46813222f868e3e90ecaaf9b54dc80bbb031 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
@ -22,5 +22,5 @@ index 8f7e09b..ae65526 100644
BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
--
1.8.1-rc2
1.8.2

12
CraftBukkit-Patches/0038-PlayerItemDamageEvent.patch
View File

@ -1,4 +1,4 @@
From 64d764df1534b32be328af8a409620fe18575522 Mon Sep 17 00:00:00 2001
From 65ffb309f825299f03ec5feabb5bf617ba1035da 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,10 +8,10 @@ Subject: [PATCH] PlayerItemDamageEvent
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 389558c..70d9160 100644
index 68e481c..de7e7ac 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -176,7 +176,13 @@ public final class ItemStack {
@@ -178,7 +178,13 @@ public final class ItemStack {
return Item.byId[this.id].getMaxDurability();
}
@ -25,7 +25,7 @@ index 389558c..70d9160 100644
if (!this.g()) {
return false;
} else {
@@ -191,7 +197,16 @@ public final class ItemStack {
@@ -193,7 +199,16 @@ public final class ItemStack {
}
i -= k;
@ -43,7 +43,7 @@ index 389558c..70d9160 100644
return false;
}
}
@@ -204,7 +219,7 @@ public final class ItemStack {
@@ -206,7 +221,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {
@ -53,5 +53,5 @@ index 389558c..70d9160 100644
if (entityliving instanceof EntityHuman) {
((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0039-Thread-safety.-Adds-thread-safety-for-chunk-load-unl.patch
View File

@ -1,4 +1,4 @@
From 50f499ed5c46af6ef6c6a2975976d7ec130636df Mon Sep 17 00:00:00 2001
From cb1cf48db7ca1586a4d0f12ab50101771a7de7c8 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] Thread safety. Adds thread safety for chunk load / unload
@ -37,5 +37,5 @@ index 813f662..e3676f2 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
--
1.8.1-rc2
1.8.2

6
CraftBukkit-Patches/0040-Faster-UUID-for-entities.patch
View File

@ -1,4 +1,4 @@
From 2ea34c31203154d8b790aabaf4064a09824f2c6c Mon Sep 17 00:00:00 2001
From ccf0f903a93204950a351be3ce71d7498c8b5529 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
@ -9,7 +9,7 @@ It is overkill to create a new SecureRandom on each entity create and then use i
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 9e5ce4b..83e792c 100644
index 24ab35f..c4c2595 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -154,7 +154,7 @@ public abstract class Entity {
@ -22,5 +22,5 @@ index 9e5ce4b..83e792c 100644
this.world = world;
this.setPosition(0.0D, 0.0D, 0.0D);
--
1.8.1-rc2
1.8.2

4
CraftBukkit-Patches/0041-Prevent-NPE-in-CraftSign.patch
View File

@ -1,4 +1,4 @@
From 03f9257d5a0ba384c73251024050cebfe4fc348a Mon Sep 17 00:00:00 2001
From 38f23eb3f66ce46512cd08cb0f323d894f68d447 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
@ -35,5 +35,5 @@ index 8e8a1c5..87af049 100644
if(lines[i] != null) {
sign.lines[i] = lines[i];
--
1.8.1-rc2
1.8.2