SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

[Cosmetic] Update patches to be generated with latest stable git.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2013-04-10 12:36:11 +10:00
Ursprung bf674a5279
Commit 0e9aa34299
45 geänderte Dateien mit 337 neuen und 326 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch
Datei anzeigen

@ -1,12 +1,12 @@
From c39140c5533222f176c6705cb1ae26aef0ef7cd9 Mon Sep 17 00:00:00 2001
From 6c126ae7abb177b176c616251c667517aa79456d 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.
---
.../bukkit/command/defaults/TimingsCommand.java | 4 ++++
.../org/bukkit/plugin/SimplePluginManager.java | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
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
@ -61,5 +61,5 @@ index 93fb4f5..f5f6941 100644
}
--
1.7.0.4
1.8.2.1

14
Bukkit-Patches/0003-Improved-Timings-System.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9fefede017b0a318fb123c975c54f85095be677c Mon Sep 17 00:00:00 2001
From a39f7f351d143b534f6fe754c22efce24b2f6ab1 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
@ -8,11 +8,11 @@ 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 +-
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
@ -407,5 +407,5 @@ index ea30d83..d905435 100644
} else {
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
--
1.7.0.4
1.8.2.1

8
Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch
Datei anzeigen

@ -1,11 +1,11 @@
From d2e1a053d9ef3a7631a44c7cca6cca67a0f8ec13 Mon Sep 17 00:00:00 2001
From dc1e04e664925d6c14823cb881c6cb5625fd41f5 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.
---
.../org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
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
@ -26,5 +26,5 @@ index 29ec3fc..a31500c 100644
if (result == null) {
--
1.7.0.4
1.8.2.1

8
Bukkit-Patches/0005-PlayerItemDamageEvent.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 28a8f7cc234e1c333e35906ab008befb8eb94ea4 Mon Sep 17 00:00:00 2001
From 47fad07cf72d34c038ba0bae648c70a40dd00276 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 files changed, 54 insertions(+), 0 deletions(-)
.../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
@ -69,5 +69,5 @@ index 0000000..38a72ab
+ }
+}
--
1.7.0.4
1.8.2.1

74
CraftBukkit-Patches/0002-Spigot-Changes.patch
Datei anzeigen

@ -1,35 +1,35 @@
From 12e671af8e48ce6ae5f0ca2c87d90dee326cff55 Mon Sep 17 00:00:00 2001
From 44e3b478f6aeb4b9298b06599679448608345ff0 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 | 69 ++++++++++++
src/main/java/org/bukkit/craftbukkit/Spigot.java | 20 ++++
.../craftbukkit/chunkio/ChunkIOProvider.java | 2 +-
src/main/resources/configurations/bukkit.yml | 26 +++++
24 files changed, 389 insertions(+), 77 deletions(-)
.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
@ -406,10 +406,10 @@ index c81793a..133c310 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 464b250..28798af 100644
index ed670d9..da7ad33 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -303,7 +303,7 @@ public abstract class PlayerList {
@@ -305,7 +305,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
} else if (!this.isWhitelisted(s)) {
@ -418,7 +418,7 @@ index 464b250..28798af 100644
} else {
String s2 = socketaddress.toString();
@@ -1044,7 +1044,13 @@ public abstract class PlayerList {
@@ -1046,7 +1046,13 @@ public abstract class PlayerList {
public void r() {
while (!this.players.isEmpty()) {
@ -466,7 +466,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 9698185..cddc890 100644
index 03b7167..0958209 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 {
@ -734,10 +734,10 @@ index 13f67da..a5a0e04 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7b9c787..8e02225 100644
index 8a079d3..e7c3a0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -146,7 +146,7 @@ public final class CraftServer implements Server {
@@ -145,7 +145,7 @@ public final class CraftServer implements Server {
protected final MinecraftServer console;
protected final DedicatedPlayerList playerList;
private final Map<String, World> worlds = new LinkedHashMap<String, World>();
@ -808,7 +808,7 @@ index 7b9c787..8e02225 100644
loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
@@ -1054,13 +1072,8 @@ public final class CraftServer implements Server {
@@ -1055,13 +1073,8 @@ public final class CraftServer implements Server {
return count;
}
@ -823,7 +823,7 @@ index 7b9c787..8e02225 100644
OfflinePlayer result = getPlayerExact(name);
String lname = name.toLowerCase();
@@ -1068,17 +1081,7 @@ public final class CraftServer implements Server {
@@ -1069,17 +1082,7 @@ public final class CraftServer implements Server {
result = offlinePlayers.get(lname);
if (result == null) {
@ -842,7 +842,7 @@ index 7b9c787..8e02225 100644
result = new CraftOfflinePlayer(this, name);
offlinePlayers.put(lname, result);
}
@@ -1216,7 +1219,7 @@ public final class CraftServer implements Server {
@@ -1217,7 +1220,7 @@ public final class CraftServer implements Server {
Set<OfflinePlayer> players = new HashSet<OfflinePlayer>();
for (String file : files) {
@ -851,7 +851,7 @@ index 7b9c787..8e02225 100644
}
players.addAll(Arrays.asList(getOnlinePlayers()));
@@ -1322,7 +1325,7 @@ public final class CraftServer implements Server {
@@ -1323,7 +1326,7 @@ public final class CraftServer implements Server {
public List<String> tabCompleteCommand(Player player, String message) {
List<String> completions = null;
try {
@ -1019,5 +1019,5 @@ index 61a95e3..bc00ad4 100644
monsters: 70
animals: 15
--
1.7.0.4
1.8.2.1

14
CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 02388be2d963563eea16a68a5583f03908f17704 Mon Sep 17 00:00:00 2001
From 7cdbe04118599b614a616171d51f4dee54ffd0e5 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 +++++++++++++++++
.../java/org/bukkit/craftbukkit/CraftWorld.java | 6 ++++++
src/main/resources/configurations/bukkit.yml | 2 ++
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
@ -47,7 +47,7 @@ index aa8d83f..6d54e97 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index cddc890..78e52d4 100644
index 0958209..3d77400 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -950,6 +950,23 @@ public abstract class World implements IBlockAccess {
@ -119,5 +119,5 @@ index bc00ad4..524c0ca 100644
cactus-growth-modifier: 100
melon-growth-modifier: 100
--
1.7.0.4
1.8.2.1

12
CraftBukkit-Patches/0004-LongHash-Tweaks.patch
Datei anzeigen

@ -1,14 +1,14 @@
From ae4248107c916a12bb139cfb1e00a45097dcfb02 Mon Sep 17 00:00:00 2001
From 58a5ac2f759380063702db6ea9c2e6d5dac41bd4 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 deletions(-)
.../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
@ -136,5 +136,5 @@ index 01861cc..dbd33fa 100644
long[] inner = keys[index];
if (inner == null) {
--
1.7.0.4
1.8.2.1

22
CraftBukkit-Patches/0005-Async-Operation-Catching.patch
Datei anzeigen

@ -1,16 +1,16 @@
From 9ba6ff4b8b7a079bdec4c7cbe26870fe2444f562 Mon Sep 17 00:00:00 2001
From b2dfa37cd8758766e20a5060df024e6eff41ec39 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.
---
.../java/net/minecraft/server/EntityTracker.java | 2 ++
.../net/minecraft/server/EntityTrackerEntry.java | 2 ++
src/main/java/net/minecraft/server/World.java | 2 ++
.../java/org/bukkit/craftbukkit/CraftWorld.java | 3 +++
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 +
5 files changed, 10 insertions(+), 0 deletions(-)
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
@ -53,7 +53,7 @@ index 4871bd7..8aa2e88 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 78e52d4..5b8cee3 100644
index 3d77400..92e8a37 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -919,6 +919,7 @@ public abstract class World implements IBlockAccess {
@ -101,10 +101,10 @@ index a303090..f5e63f8 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d37d719..0deb4df 100644
index a93625c..5b74a5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -213,6 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void kickPlayer(String message) {
@ -113,5 +113,5 @@ index d37d719..0deb4df 100644
getHandle().playerConnection.disconnect(message == null ? "" : message);
--
1.7.0.4
1.8.2.1

12
CraftBukkit-Patches/0006-View-Distance.patch
Datei anzeigen

@ -1,14 +1,14 @@
From fdca3f0b93ab6b12e125a90328b16d0b1acb3a79 Mon Sep 17 00:00:00 2001
From 2d00479f5aad1da9809b642a58168103b3766c67 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!
---
.../java/net/minecraft/server/PlayerChunkMap.java | 2 +-
.../java/net/minecraft/server/WorldServer.java | 2 +-
.../java/org/bukkit/craftbukkit/CraftWorld.java | 5 +++++
src/main/resources/configurations/bukkit.yml | 1 +
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
@ -80,5 +80,5 @@ index 524c0ca..9b85e13 100644
random-light-updates: true
water-creatures-per-chunk: 0
--
1.7.0.4
1.8.2.1

16
CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
Datei anzeigen

@ -1,14 +1,16 @@
From a32a925ad6864721c2a21eb53d815a89d881f2b1 Mon Sep 17 00:00:00 2001
From c4475a155503a8287d1059127faa05576ca6540b 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.
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.
---
.../java/net/minecraft/server/EntityHuman.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
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 101c2a0..76cfc2a 100644
index 91b44a0..df33d80 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;
@ -25,7 +27,7 @@ index 101c2a0..76cfc2a 100644
import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerBedLeaveEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
@@ -941,6 +943,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@@ -960,6 +962,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
super.die();
this.defaultContainer.b(this);
if (this.activeContainer != null) {
@ -37,5 +39,5 @@ index 101c2a0..76cfc2a 100644
}
}
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0008-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
Datei anzeigen

@ -1,11 +1,11 @@
From adf49b414d6997ce4aaae6a65a3034d72e3eed53 Mon Sep 17 00:00:00 2001
From aeb91819bcc99160f5de896ed0094ba0f0dd05d8 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
---
.../java/net/minecraft/server/NibbleArray.java | 40 ++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
.../java/net/minecraft/server/NibbleArray.java | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/NibbleArray.java
diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
@ -55,5 +55,5 @@ index 0000000..5d75a54
+ }
+}
--
1.7.0.4
1.8.2.1

18
CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
Datei anzeigen

@ -1,17 +1,19 @@
From 62fd1a277c1bb1539fa0321896b9f109cc7e2887 Mon Sep 17 00:00:00 2001
From 08e4e84c8cf2e75fb8e052b8ef74773dc0e7a5fa 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 buffers when non-trivial value Saving from 40-45% of memory use by chunk section data.
Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
buffers when non-trivial value Saving from 40-45% of memory use by chunk
section data.
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 ++++++-
.../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
@ -383,5 +385,5 @@ index 79c3893..ad58bef 100644
}
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 16e33c98d1d14e459ba90f75850bfebea6a9a260 Mon Sep 17 00:00:00 2001
From 602142733870a1f674deb1e40b4318be9cd36479 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
---
.../java/net/minecraft/server/OldChunkLoader.java | 120 ++++++++++++++++++++
1 files changed, 120 insertions(+), 0 deletions(-)
.../java/net/minecraft/server/OldChunkLoader.java | 120 +++++++++++++++++++++
1 file changed, 120 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/OldChunkLoader.java
diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
@ -136,5 +136,5 @@ index 0000000..65b0b70
+}
\ No newline at end of file
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
Datei anzeigen

@ -1,11 +1,11 @@
From c2ff125b200c05d07496af538552e7ff72bacbfa Mon Sep 17 00:00:00 2001
From c0766b26f9c09da34b9ccdd79d971746376df495 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
---
.../java/net/minecraft/server/OldChunkLoader.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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 65b0b70..0b3bd0d 100644
@ -27,5 +27,5 @@ index 65b0b70..0b3bd0d 100644
}
}
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 54e97bc4f6af0326c9eaea5f88c52b86307d6b88 Mon Sep 17 00:00:00 2001
From 8f7d3dfeffad6861164302cbaa3cdadce69852fd 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.
---
.../org/bukkit/craftbukkit/util/Versioning.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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
@ -21,5 +21,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.7.0.4
1.8.2.1

10
CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch
Datei anzeigen

@ -1,13 +1,13 @@
From 4c1d324eeeb423731b0f9ba3e36aefe4e7a39de4 Mon Sep 17 00:00:00 2001
From 7aeceff7af9f541d67165c8046dd1291dd205382 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.
---
.../net/minecraft/server/Packet51MapChunk.java | 13 +++++++++++++
.../java/net/minecraft/server/PlayerChunk.java | 2 +-
2 files changed, 14 insertions(+), 1 deletions(-)
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
@ -52,5 +52,5 @@ index 10a43b6..20f8e8a 100644
entityplayer.chunkCoordIntPairQueue.remove(this.location);
if (this.b.isEmpty()) {
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 17e2d92a3c6cf85d461ad1e19d06299653341f0e Mon Sep 17 00:00:00 2001
From 37f83e684584fbd91f6442386ab26e2a54c0a9f3 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 files changed, 1 insertions(+), 0 deletions(-)
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
@ -20,5 +20,5 @@ index 7890d6f..8e743ec 100644
this.boundingBox.d(d0, d1, d2);
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
--
1.7.0.4
1.8.2.1

10
CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
Datei anzeigen

@ -1,14 +1,14 @@
From f56f2bd9dcc5ab48c6a3d662c8bed6556e58d820 Mon Sep 17 00:00:00 2001
From ade3d3ab314377309d14ead913ec506ee99abd05 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 files changed, 6 insertions(+), 8 deletions(-)
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 5b8cee3..307171b 100644
index 92e8a37..b4ec71e 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 5b8cee3..307171b 100644
}
// CraftBukkit end
--
1.7.0.4
1.8.2.1

14
CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
Datei anzeigen

@ -1,17 +1,17 @@
From 53a67a707f0a466ec97a5892fd6440d221605d0d Mon Sep 17 00:00:00 2001
From aa816997677b3a1b8d7f2d754f05859c2de92372 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 ++++++++++++++
.../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 5bf5fdc..9930618 100644
index 64d5882..8de8570 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -83,6 +83,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -27,7 +27,7 @@ index 5bf5fdc..9930618 100644
public MinecraftServer(OptionSet options) { // CraftBukkit - signature file -> OptionSet
k = this;
@@ -377,39 +383,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -379,39 +385,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void run() {
try {
if (this.init()) {
@ -136,5 +136,5 @@ index 0000000..f114a31
+ }
+}
--
1.7.0.4
1.8.2.1

40
CraftBukkit-Patches/0017-Improved-Timings-System.patch
Datei anzeigen

@ -1,21 +1,21 @@
From f911a115312d4fe9347642dac63ba4714b3361fe Mon Sep 17 00:00:00 2001
From 90d50fe2bd2b0db517e5b30d6e1f0924fb13bb7a 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 deletions(-)
.../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
@ -145,7 +145,7 @@ index 9210d96..14854ac 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 9930618..4010cbf 100644
index 8de8570..16b15df 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;
@ -164,7 +164,7 @@ index 9930618..4010cbf 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -397,7 +397,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -399,7 +399,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
lastTick = curTime;
MinecraftServer.currentTick++;
@ -175,7 +175,7 @@ index 9930618..4010cbf 100644
}
// Spigot end
} else {
@@ -496,6 +499,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -498,6 +501,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void r() {
this.methodProfiler.a("levels");
@ -183,7 +183,7 @@ index 9930618..4010cbf 100644
// CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
@@ -504,7 +508,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -506,7 +510,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
processQueue.remove().run();
}
@ -194,7 +194,7 @@ index 9930618..4010cbf 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
@@ -556,7 +563,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -558,7 +565,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -204,7 +204,7 @@ index 9930618..4010cbf 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -565,14 +574,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -567,14 +576,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
this.methodProfiler.c("connection");
@ -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 307171b..0afe88d 100644
index b4ec71e..e2d0a88 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.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch
Datei anzeigen

@ -1,11 +1,11 @@
From a7074cb42a6e61500be1926ddf1af17e07f4986f Mon Sep 17 00:00:00 2001
From 16dace4c2615d56f9bf5d7147701ef03782784ce 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.
---
.../java/net/minecraft/server/EntityLiving.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
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
@ -33,5 +33,5 @@ index 14854ac..322e37f 100644
this.o(entity);
}
--
1.7.0.4
1.8.2.1

11
CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch
Datei anzeigen

@ -1,11 +1,12 @@
From af0142f3be262d3bbd6928557430c1a776fc7aae Mon Sep 17 00:00:00 2001
From 53a0398ca0dffd1b12427235bc489394e1b0c7a1 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.
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 files changed, 43 insertions(+), 3 deletions(-)
.../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
@ -104,5 +105,5 @@ index b3e2818..6362a37 100644
continue label110;
}
--
1.7.0.4
1.8.2.1

10
CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 90775f48e28029d31d9760dce09695840d25ea85 Mon Sep 17 00:00:00 2001
From 52005cd2ae3ed48a244cca27a962460445927c3a 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 files changed, 7 insertions(+), 0 deletions(-)
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 0afe88d..c390e65 100644
index e2d0a88..16bd795 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1334,6 +1334,13 @@ public abstract class World implements IBlockAccess {
@ -26,5 +26,5 @@ index 0afe88d..c390e65 100644
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
--
1.7.0.4
1.8.2.1

22
CraftBukkit-Patches/0022-Entity-Activation-Range.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 09fc514b2c1ef37123c1a088f426d44835116d24 Mon Sep 17 00:00:00 2001
From 7bfa98d5f818738e6adf49abf8bc407cf9b845ce 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
@ -8,14 +8,14 @@ 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 +
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
@ -89,7 +89,7 @@ index 6d54e97..924b6ed 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 c390e65..ccc49a5 100644
index 16bd795..a50bcb1 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;
@ -441,5 +441,5 @@ index a63dc22..5822e41 100644
world:
growth-chunks-per-tick: 1000
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch
Datei anzeigen

@ -1,12 +1,12 @@
From 2cb1eccff1aaf89feb841eddde109e2125f2003c Mon Sep 17 00:00:00 2001
From 2eccb6337392a0b22ad424e333eb27d9f8e4258f 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
---
.../java/net/minecraft/server/WorldServer.java | 21 +++++++++++--------
1 files changed, 12 insertions(+), 9 deletions(-)
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
@ -43,5 +43,5 @@ index 0abfc35..615968f 100644
return arraylist;
}
--
1.7.0.4
1.8.2.1

10
CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 1903fcd6f0963c98738afa51dc605e042653ebdf Mon Sep 17 00:00:00 2001
From b4cd08b3d500ed538ddffbfc5c6254f20d47f7f5 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
@ -6,11 +6,11 @@ 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.
---
.../java/net/minecraft/server/EntityPlayer.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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 14f2521..59c463c 100644
index eb07d8e..410148f 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 14f2521..59c463c 100644
}
--
1.7.0.4
1.8.2.1

13
CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
Datei anzeigen

@ -1,12 +1,13 @@
From 1ed9c7ab2ad044fd4407719ac0e7c0d8b4f050ee Mon Sep 17 00:00:00 2001
From 46ec0fb4245d8d49bf692585f2e7acc17344548e 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.
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(+), 0 deletions(-)
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
@ -710,5 +711,5 @@ index 0000000..f1690a2
+}
\ No newline at end of file
--
1.7.0.4
1.8.2.1

20
CraftBukkit-Patches/0026-Watchdog-Thread.patch
Datei anzeigen

@ -1,23 +1,23 @@
From 537ebc42f0bd36efe1a8c36983c5b645d65703e9 Mon Sep 17 00:00:00 2001
From ed80e4532dcea20ec8dbe4bd8773f768c9532a7e 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 +
.../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 4010cbf..168394f 100644
index 16b15df..4a9d711 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -401,6 +401,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -403,6 +403,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.q();
SpigotTimings.serverTickTimer.stopTiming();
org.bukkit.CustomTimingsHandler.tick();
@ -25,7 +25,7 @@ index 4010cbf..168394f 100644
}
// Spigot end
} else {
@@ -428,6 +429,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -430,6 +431,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {
@ -401,5 +401,5 @@ index 5822e41..a62ba24 100644
default:
growth-chunks-per-tick: 650
--
1.7.0.4
1.8.2.1

44
CraftBukkit-Patches/0027-Netty.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 625a5680d0be28a1caa3bd65d02703a41f321a45 Mon Sep 17 00:00:00 2001
From 53c8a1e1b7aa88229c34a7bf248dce34abf28579 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
@ -31,24 +31,24 @@ Subject: [PATCH] Netty
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 ++
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
@ -61,7 +61,7 @@ Subject: [PATCH] Netty
create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java
diff --git a/pom.xml b/pom.xml
index 8f2e071..73c676a 100644
index fce45f8..55e6dc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,11 @@
@ -155,7 +155,7 @@ index 1862863..5a24f2a 100644
+ public void setSocketAddress(SocketAddress address) { k = address; } // Spigot
}
diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
index 9c21129..fd2b9c9 100644
index 84dbb88..617b474 100644
--- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
+++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
@@ -42,7 +42,7 @@ public class Packet51MapChunk extends Packet {
@ -1169,5 +1169,5 @@ index 0000000..5dc3754
+ DATA;
+}
--
1.7.0.4
1.8.2.1

18
CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch
Datei anzeigen

@ -1,16 +1,16 @@
From bcce18e07928f79f874a5cf5dc200889bc0327cd Mon Sep 17 00:00:00 2001
From afdb25739da5d3df806d709e4628736fac6a519a 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
---
.../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(+), 0 deletions(-)
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 59c463c..81ba038 100644
index 410148f..0c36785 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,10 +22,10 @@ index 59c463c..81ba038 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 28798af..d212080 100644
index da7ad33..eb3e7a4 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -713,7 +713,23 @@ public abstract class PlayerList {
@@ -715,7 +715,23 @@ public abstract class PlayerList {
this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping));
}
// CraftBukkit end */
@ -62,5 +62,5 @@ index a62ba24..8fa8c7a 100644
restart-on-crash: false
restart-script-location: /path/to/server/start.sh
--
1.7.0.4
1.8.2.1

15
CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
Datei anzeigen

@ -1,17 +1,18 @@
From 768d209d592385a01bb859f00fa00322fb325020 Mon Sep 17 00:00:00 2001
From 0a55f29b08d6720b563cec891f68714e943839d4 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
Subject: [PATCH] Return bed location itself instead of next to bed; Fixes
BUKKIT-3604
---
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 22 ++++++++++++++++++-
1 files changed, 20 insertions(+), 2 deletions(-)
.../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 0deb4df..8eb93c0 100644
index 5b74a5b..a913a1c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -626,10 +626,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -628,10 +628,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
ChunkCoordinates bed = getHandle().getBed();
if (world != null && bed != null) {
@ -43,5 +44,5 @@ index 0deb4df..8eb93c0 100644
return null;
}
--
1.7.0.4
1.8.2.1

15
CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
Datei anzeigen

@ -1,17 +1,18 @@
From 6ed59638e19ee1a9234500789a38e74de0167d4e Mon Sep 17 00:00:00 2001
From f35ee6c9101a78d09ec18b6cd5f122d613354776 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
Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
BUKKIT-3604
---
src/main/java/net/minecraft/server/PlayerList.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
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 d212080..126b177 100644
index eb3e7a4..f94cc54 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -491,7 +491,14 @@ public abstract class PlayerList {
@@ -493,7 +493,14 @@ public abstract class PlayerList {
if (exitWorld != null) {
if ((cause == TeleportCause.END_PORTAL) && (i == 0)) {
// THE_END -> NORMAL; use bed if available, otherwise default spawn
@ -28,5 +29,5 @@ index d212080..126b177 100644
exit = exitWorld.getWorld().getSpawnLocation();
}
--
1.7.0.4
1.8.2.1

11
CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
Datei anzeigen

@ -1,11 +1,12 @@
From d19f54095e6d64bbc7f0f9386c071118541f5f7e Mon Sep 17 00:00:00 2001
From c99e4572ef7c0e1e2aba94f4446e8c7e3778b113 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
Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when
EntityHanging moves
---
.../java/net/minecraft/server/EntityHanging.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
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
@ -34,5 +35,5 @@ index f697d85..1dfb02f 100644
this.h();
}
--
1.7.0.4
1.8.2.1

12
CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
Datei anzeigen

@ -1,17 +1,17 @@
From 8683fb347217057606245806c92152829d9d6694 Mon Sep 17 00:00:00 2001
From 11d2989ca3bad19e2fd8989c7c5f4d6845ceae99 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
---
.../java/net/minecraft/server/EntityPlayer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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 81ba038..f5910a2 100644
index 0c36785..3ce9f8b 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 {
@@ -417,7 +417,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(boolean flag, boolean flag1, boolean flag2) {
@ -21,5 +21,5 @@ index 81ba038..f5910a2 100644
if (this.isSleeping()) {
this.o().getTracker().sendPacketToEntity(this, new Packet18ArmAnimation(this, 3));
--
1.7.0.4
1.8.2.1

11
CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
Datei anzeigen

@ -1,11 +1,12 @@
From 8044a3fa502f0d94c47e6ece1e49c175c8f0ff0d Mon Sep 17 00:00:00 2001
From 7e3bf20b26af96ca522dff934750dddaccb3334a 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
Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when
filling empty bucket
---
.../server/DispenseBehaviorEmptyBucket.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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
@ -21,5 +22,5 @@ index 8f7e09b..ae65526 100644
BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 54752e418a3c9ecd8f3408f94297ba76b3c9acbb Mon Sep 17 00:00:00 2001
From 622c39c692e56421f98113564f517d44a8ecdb63 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 files changed, 17 insertions(+), 2 deletions(-)
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
@ -53,5 +53,5 @@ index 7dc36a8..cd032ae 100644
if (entityliving instanceof EntityHuman) {
((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch
Datei anzeigen

@ -1,12 +1,12 @@
From fdee8c0ee2691d25a401bd66468577f9b2d51859 Mon Sep 17 00:00:00 2001
From ab9322e5ec2898b4039451af370078343072b1c6 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 files changed, 1 insertions(+), 1 deletions(-)
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
@ -22,5 +22,5 @@ index 482fecb..52ecc09 100644
this.world = world;
this.setPosition(0.0D, 0.0D, 0.0D);
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch
Datei anzeigen

@ -1,12 +1,12 @@
From 6a9329fd0687f6316cb92c898bf8ed4ed4b3550e Mon Sep 17 00:00:00 2001
From c5482476ab6be812fbf52521e09ce0a199aab63a 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().
---
.../org/bukkit/craftbukkit/block/CraftSign.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
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
@ -35,5 +35,5 @@ index 1647100..43c4434 100644
if(lines[i] != null) {
sign.lines[i] = lines[i];
--
1.7.0.4
1.8.2.1

10
CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch
Datei anzeigen

@ -1,13 +1,13 @@
From f8b44c25837c09e65290e4a609b351bd1ec4e36b Mon Sep 17 00:00:00 2001
From 4273e8e22cd80e2b30dd56579ba9e3e210eda449 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(+), 0 deletions(-)
.../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
@ -355,5 +355,5 @@ index 0000000..678aa91
+ }
+}
--
1.7.0.4
1.8.2.1

16
CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ff3fc702ba10ce96331bd0b3e50c582ad177936a Mon Sep 17 00:00:00 2001
From d06dd0edec0615add8d3ab9497970c32b79e9391 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
@ -11,11 +11,11 @@ This has multiple benefits:
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(+), 0 deletions(-)
.../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
@ -84,7 +84,7 @@ index 8dd1275..13dc9fa 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 ac99395..e38f39c 100644
index ac99395..92259e5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -345,4 +345,30 @@ public class Spigot {
@ -135,5 +135,5 @@ index 8fa8c7a..35056d9 100644
world:
growth-chunks-per-tick: 1000
--
1.7.0.4
1.8.2.1

14
CraftBukkit-Patches/0039-BungeeCord-Support.patch
Datei anzeigen

@ -1,14 +1,14 @@
From b2de83d4a03ce77384dee36545abce21108680df Mon Sep 17 00:00:00 2001
From 7b3cbd9f58a64e4f2f3e3138660c35ae16e06113 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.
---
.../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(+), 0 deletions(-)
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
@ -33,7 +33,7 @@ index fcfc3d2..3448fc5 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index e38f39c..49092c7 100644
index 92259e5..b5953ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -23,6 +23,7 @@ public class Spigot {
@ -66,5 +66,5 @@ index 35056d9..df8dfaa 100644
default:
growth-chunks-per-tick: 650
--
1.7.0.4
1.8.2.1

22
CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
Datei anzeigen

@ -1,21 +1,21 @@
From c9c8a4745f0652ba8cd5e0f89e6ee90677036845 Mon Sep 17 00:00:00 2001
From 7c7fc1b2b48f008dd2ad6f2bc0ba304a9cf10503 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.
---
.../java/net/minecraft/server/MinecraftServer.java | 2 +-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 2 ++
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +-
src/main/resources/configurations/bukkit.yml | 1 +
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 168394f..3b2d9d3 100644
index 4a9d711..8e02ca4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1073,7 +1073,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -1075,7 +1075,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public int S() {
@ -25,7 +25,7 @@ index 168394f..3b2d9d3 100644
public abstract boolean T();
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 49092c7..121b5ba 100644
index b5953ce..504bd8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -24,6 +24,7 @@ public class Spigot {
@ -45,10 +45,10 @@ index 49092c7..121b5ba 100644
if (metrics == null) {
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8eb93c0..f9a7645 100644
index a913a1c..10bfb8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -828,7 +828,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -830,7 +830,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setTexturePack(String url) {
Validate.notNull(url, "Texture pack URL cannot be null");
@ -70,5 +70,5 @@ index df8dfaa..bc0b044 100644
default:
growth-chunks-per-tick: 650
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch
Datei anzeigen

@ -1,12 +1,12 @@
From f91b8e80a9a261802238a0627a7ba13234b8280b Mon Sep 17 00:00:00 2001
From 2dc83cca06e50e828e836669e711c67fa4f09716 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.
---
.../java/net/minecraft/server/EntityTracker.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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
@ -22,5 +22,5 @@ index 32ce51d..7cd2c26 100644
this.addEntity(entity, 64, 3, true);
} else if (entity instanceof EntityWither) {
--
1.7.0.4
1.8.2.1

8
CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch
Datei anzeigen

@ -1,12 +1,12 @@
From 2d7011be015168fd80dfcedb011f92c2ddeb964e Mon Sep 17 00:00:00 2001
From eb50818c3f874a1d1241d1e8a23b974057e37a0b 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 +-
.../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
@ -74,5 +74,5 @@ index b28d6a3..e70e4e4 100644
protected final WorldMap worldMap;
--
1.7.0.4
1.8.2.1

11
CraftBukkit-Patches/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
Datei anzeigen

@ -1,12 +1,13 @@
From 6a9fd668688a25eb082d7757d15e4f25ed2970a4 Mon Sep 17 00:00:00 2001
From 5ba72ebebf67d85199b5238967da9f785eaca07b 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"
Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes
BUKKIT-3951"
This reverts commit 052e955ed71a30516a5e9cfd76649daaba4ae7d8.
---
.../craftbukkit/scheduler/CraftScheduler.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
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
@ -31,5 +32,5 @@ index a30f217..35badf3 100644
private int nextId() {
--
1.7.0.4
1.8.2.1