OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 22:45:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to 1.8.4

Browse source
This commit is contained in:
Thinkofdeath 2015-05-09 21:23:26 +01:00 committed by Zach Brown
parent 07ff818e53
commit 033b54d5de
156 changed files with 603 additions and 866 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 868cd5a60fbd282dd9eb54b196dee70088dd3c0e Mon Sep 17 00:00:00 2001
From 8d954ca68fa1829aab7497155ad91a55f4f6a312 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 9dd0d06..78f50bd 100644
index a674b3f..f38a019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
@ -16,7 +16,7 @@ index 9dd0d06..78f50bd 100644
- <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.8.3-R0.1-SNAPSHOT</version>
<version>1.8.4-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Bukkit</name>
@ -29,5 +29,5 @@ index 9dd0d06..78f50bd 100644
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
--
2.1.0
2.1.4

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

@ -1,4 +1,4 @@
From 9af5d59407a8ffd25db9618d1afeb509c197f52b Mon Sep 17 00:00:00 2001
From a326d05aad5efc05a9fabeefbeae21b4a132ed36 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index d8f0054..1c8d4ea 100644
index c5503f6..333f528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -18,7 +18,7 @@ index d8f0054..1c8d4ea 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.8.3-R0.1-SNAPSHOT</version>
<version>1.8.4-R0.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@ -111,5 +111,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
2.1.0
2.1.4

97
CraftBukkit-Patches/0002-mc-dev-imports.patch
View file

@ -1,4 +1,4 @@
From 20f805a73e32f1fb0ce46928b921685fbf92661a Mon Sep 17 00:00:00 2001
From cf7c6c8710b54f1a7451163c6aab72baf7865e42 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports
@ -1000,10 +1000,10 @@ index 0000000..f15b199
+}
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
new file mode 100644
index 0000000..54133a7
index 0000000..81289b7
--- /dev/null
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -0,0 +1,113 @@
@@ -0,0 +1,118 @@
+package net.minecraft.server;
+
+import java.util.Iterator;
@ -1054,7 +1054,7 @@ index 0000000..54133a7
+ this.a((ICommand) (new CommandWorldBorder()));
+ this.a((ICommand) (new CommandTitle()));
+ this.a((ICommand) (new CommandEntityData()));
+ if (MinecraftServer.getServer().ad()) {
+ if (MinecraftServer.getServer().ae()) {
+ this.a((ICommand) (new CommandOp()));
+ this.a((ICommand) (new CommandDeop()));
+ this.a((ICommand) (new CommandStop()));
@ -1095,8 +1095,13 @@ index 0000000..54133a7
+ while (iterator.hasNext()) {
+ EntityHuman entityhuman = (EntityHuman) iterator.next();
+
+ if (entityhuman != icommandlistener && minecraftserver.getPlayerList().isOp(entityhuman.getProfile()) && icommand.canUse(icommandlistener) && (!(icommandlistener instanceof RemoteControlCommandListener) || MinecraftServer.getServer().q())) {
+ entityhuman.sendMessage(chatmessage);
+ if (entityhuman != icommandlistener && minecraftserver.getPlayerList().isOp(entityhuman.getProfile()) && icommand.canUse(icommandlistener)) {
+ boolean flag1 = icommandlistener instanceof MinecraftServer && MinecraftServer.getServer().r();
+ boolean flag2 = icommandlistener instanceof RemoteControlCommandListener && MinecraftServer.getServer().q();
+
+ if (flag1 || flag2 || !(icommandlistener instanceof RemoteControlCommandListener) && !(icommandlistener instanceof MinecraftServer)) {
+ entityhuman.sendMessage(chatmessage);
+ }
+ }
+ }
+ }
@ -1105,13 +1110,13 @@ index 0000000..54133a7
+ minecraftserver.sendMessage(chatmessage);
+ }
+
+ boolean flag1 = minecraftserver.worldServer[0].getGameRules().getBoolean("sendCommandFeedback");
+ boolean flag3 = minecraftserver.worldServer[0].getGameRules().getBoolean("sendCommandFeedback");
+
+ if (icommandlistener instanceof CommandBlockListenerAbstract) {
+ flag1 = ((CommandBlockListenerAbstract) icommandlistener).m();
+ flag3 = ((CommandBlockListenerAbstract) icommandlistener).m();
+ }
+
+ if ((i & 1) != 1 && flag1) {
+ if ((i & 1) != 1 && flag3 || icommandlistener instanceof MinecraftServer) {
+ icommandlistener.sendMessage(new ChatMessage(s, aobject));
+ }
+
@ -1995,7 +2000,7 @@ index 0000000..27ce9d9
+}
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
new file mode 100644
index 0000000..871859f
index 0000000..59b06c4
--- /dev/null
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
@@ -0,0 +1,114 @@
@ -2011,10 +2016,10 @@ index 0000000..871859f
+
+ private static final Logger f = LogManager.getLogger();
+ public static final IAttribute maxHealth = (new AttributeRanged((IAttribute) null, "generic.maxHealth", 20.0D, 0.0D, Double.MAX_VALUE)).a("Max Health").a(true);
+ public static final IAttribute b = (new AttributeRanged((IAttribute) null, "generic.followRange", 32.0D, 0.0D, 2048.0D)).a("Follow Range");
+ public static final IAttribute FOLLOW_RANGE = (new AttributeRanged((IAttribute) null, "generic.followRange", 32.0D, 0.0D, 2048.0D)).a("Follow Range");
+ public static final IAttribute c = (new AttributeRanged((IAttribute) null, "generic.knockbackResistance", 0.0D, 0.0D, 1.0D)).a("Knockback Resistance");
+ public static final IAttribute d = (new AttributeRanged((IAttribute) null, "generic.movementSpeed", 0.699999988079071D, 0.0D, Double.MAX_VALUE)).a("Movement Speed").a(true);
+ public static final IAttribute e = new AttributeRanged((IAttribute) null, "generic.attackDamage", 2.0D, 0.0D, Double.MAX_VALUE);
+ public static final IAttribute MOVEMENT_SPEED = (new AttributeRanged((IAttribute) null, "generic.movementSpeed", 0.699999988079071D, 0.0D, Double.MAX_VALUE)).a("Movement Speed").a(true);
+ public static final IAttribute ATTACK_DAMAGE = new AttributeRanged((IAttribute) null, "generic.attackDamage", 2.0D, 0.0D, Double.MAX_VALUE);
+
+ public static NBTTagList a(AttributeMapBase attributemapbase) {
+ NBTTagList nbttaglist = new NBTTagList();
@ -2582,10 +2587,10 @@ index 0000000..2a04b86
+}
diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
new file mode 100644
index 0000000..3eeed3e
index 0000000..c6b5f70
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
@@ -0,0 +1,57 @@
@@ -0,0 +1,58 @@
+package net.minecraft.server;
+
+import java.io.DataInput;
@ -2609,6 +2614,7 @@ index 0000000..3eeed3e
+ }
+
+ void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
+ nbtreadlimiter.a(192L);
+ int j = datainput.readInt();
+
+ nbtreadlimiter.a((long) (8 * j));
@ -2645,10 +2651,10 @@ index 0000000..3eeed3e
+}
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
new file mode 100644
index 0000000..63c3bf9
index 0000000..5f17034
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
@@ -0,0 +1,75 @@
@@ -0,0 +1,76 @@
+package net.minecraft.server;
+
+import java.io.DataInput;
@ -2676,6 +2682,7 @@ index 0000000..63c3bf9
+ }
+
+ void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
+ nbtreadlimiter.a(192L);
+ int j = datainput.readInt();
+
+ nbtreadlimiter.a((long) (32 * j));
@ -3645,7 +3652,7 @@ index 0000000..b07e7d5
+}
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
new file mode 100644
index 0000000..42188fa
index 0000000..86b1f37
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -0,0 +1,175 @@
@ -3725,7 +3732,7 @@ index 0000000..42188fa
+ Class oclass;
+ LazyInitVar lazyinitvar;
+
+ if (Epoll.isAvailable() && this.f.ah()) {
+ if (Epoll.isAvailable() && this.f.ai()) {
+ oclass = EpollServerSocketChannel.class;
+ lazyinitvar = ServerConnection.b;
+ ServerConnection.e.info("Using epoll channel type");
@ -3806,8 +3813,8 @@ index 0000000..42188fa
+ ServerConnection.e.warn("Failed to handle packet for " + networkmanager.getSocketAddress(), exception);
+ final ChatComponentText chatcomponenttext = new ChatComponentText("Internal server error");
+
+ networkmanager.a(new PacketPlayOutKickDisconnect(chatcomponenttext), new GenericFutureListener<Future<Void>>() {
+ public void operationComplete(Future<Void> future) throws Exception {
+ networkmanager.a(new PacketPlayOutKickDisconnect(chatcomponenttext), new GenericFutureListener() {
+ public void operationComplete(Future future) throws Exception {
+ networkmanager.close(chatcomponenttext);
+ }
+ }, new GenericFutureListener[0]);
@ -3826,7 +3833,7 @@ index 0000000..42188fa
+}
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
new file mode 100644
index 0000000..97c3e79
index 0000000..46845cd
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -0,0 +1,212 @@
@ -3895,14 +3902,14 @@ index 0000000..97c3e79
+ this.e.add(statistic);
+ if (statistic.d() && j == 0 && i > 0) {
+ this.g = true;
+ if (this.c.aA()) {
+ if (this.c.aB()) {
+ this.c.getPlayerList().sendMessage(new ChatMessage("chat.type.achievement", new Object[] { entityhuman.getScoreboardDisplayName(), statistic.j()}));
+ }
+ }
+
+ if (statistic.d() && j > 0 && i == 0) {
+ this.g = true;
+ if (this.c.aA()) {
+ if (this.c.aB()) {
+ this.c.getPlayerList().sendMessage(new ChatMessage("chat.type.achievement.taken", new Object[] { entityhuman.getScoreboardDisplayName(), statistic.j()}));
+ }
+ }
@ -4005,7 +4012,7 @@ index 0000000..97c3e79
+ }
+
+ public void a(EntityPlayer entityplayer) {
+ int i = this.c.as();
+ int i = this.c.at();
+ HashMap hashmap = Maps.newHashMap();
+
+ if (this.g || i - this.f > 300) {
@ -4287,10 +4294,10 @@ index 0000000..0bced98
+}
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
new file mode 100644
index 0000000..f053f4e
index 0000000..78f1f57
--- /dev/null
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -0,0 +1,346 @@
@@ -0,0 +1,338 @@
+package net.minecraft.server;
+
+import com.google.common.base.Charsets;
@ -4408,14 +4415,13 @@ index 0000000..f053f4e
+ UserCache.UserCacheEntry usercache_usercacheentry1 = (UserCache.UserCacheEntry) this.d.get(uuid);
+
+ this.c.remove(usercache_usercacheentry1.a().getName().toLowerCase(Locale.ROOT));
+ this.c.put(gameprofile.getName().toLowerCase(Locale.ROOT), usercache_usercacheentry);
+ this.e.remove(gameprofile);
+ } else {
+ this.d.put(uuid, usercache_usercacheentry);
+ this.c.put(s, usercache_usercacheentry);
+ }
+
+ this.c.put(gameprofile.getName().toLowerCase(Locale.ROOT), usercache_usercacheentry);
+ this.d.put(uuid, usercache_usercacheentry);
+ this.e.addFirst(gameprofile);
+ this.c();
+ }
+
+ public GameProfile getProfile(String s) {
@ -4473,29 +4479,16 @@ index 0000000..f053f4e
+ }
+
+ public void b() {
+ List list = null;
+ BufferedReader bufferedreader = null;
+
+ label64: {
+ try {
+ bufferedreader = Files.newReader(this.g, Charsets.UTF_8);
+ list = (List) this.b.fromJson(bufferedreader, UserCache.h);
+ break label64;
+ } catch (FileNotFoundException filenotfoundexception) {
+ ;
+ } finally {
+ IOUtils.closeQuietly(bufferedreader);
+ }
+ try {
+ bufferedreader = Files.newReader(this.g, Charsets.UTF_8);
+ List list = (List) this.b.fromJson(bufferedreader, UserCache.h);
+
+ return;
+ }
+
+ if (list != null) {
+ this.c.clear();
+ this.d.clear();
+ this.e.clear();
+ list = Lists.reverse(list);
+ Iterator iterator = list.iterator();
+ Iterator iterator = Lists.reverse(list).iterator();
+
+ while (iterator.hasNext()) {
+ UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) iterator.next();
@ -4504,6 +4497,12 @@ index 0000000..f053f4e
+ this.a(usercache_usercacheentry.a(), usercache_usercacheentry.b());
+ }
+ }
+ } catch (FileNotFoundException filenotfoundexception) {
+ ;
+ } catch (JsonParseException jsonparseexception) {
+ ;
+ } finally {
+ IOUtils.closeQuietly(bufferedreader);
+ }
+
+ }
@ -5230,5 +5229,5 @@ index 0000000..31fc0a9
+ }
+}
--
2.1.0
2.1.4

10
CraftBukkit-Patches/0004-Obfuscation-Helpers.patch
View file

@ -1,4 +1,4 @@
From 6c994ca4fee73695c21b01d45a788c411183c743 Mon Sep 17 00:00:00 2001
From 81ac39d4872b1c7aafdb5d97d52d300cd9fe8cf1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 10:38:04 +1000
Subject: [PATCH] Obfuscation Helpers
@ -6,10 +6,10 @@ Subject: [PATCH] Obfuscation Helpers
Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2693031..611a623 100644
index f82dffc..4393458 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1284,6 +1284,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1290,6 +1290,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
@ -19,9 +19,9 @@ index 2693031..611a623 100644
+ return this.q;
+ }
+ // Spigot End
public ServerConnection ap() {
public ServerConnection aq() {
return this.q;
}
--
2.1.0
2.1.4

10
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From e22436b730037f735845b884f6de8e28fa2416b4 Mon Sep 17 00:00:00 2001
From 8da8982b64580b634950760eecc6e828066f436e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -6,11 +6,11 @@ Subject: [PATCH] Spigot Configuration
Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index d57a796..8bc6ad6 100644
index c922b4c..fc5e8cf 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -163,6 +163,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
if (this.Q() < 0) {
if (this.R() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
+ // Spigot start
@ -35,7 +35,7 @@ index d57a796..8bc6ad6 100644
if (!this.getOnlineMode()) {
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d66b1bd..52e3cfa 100644
index d83842a..0356d9e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -102,6 +102,7 @@ public abstract class World implements IBlockAccess {
@ -316,5 +316,5 @@ index 0000000..961ddb4
+ }
+}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch → CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From 0af2cebd81e9666fba6d41c5147f1aee3b836c7a Mon Sep 17 00:00:00 2001
From 9ef3f73eede644ade5f6039f631806b6c688c4d5 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
@ -41,7 +41,7 @@ index 1e575fe..fa7e6df 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 75e0714..7b933b8 100644
index c81f673..abc39f1 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -970,6 +970,23 @@ public abstract class World implements IBlockAccess {
@ -92,5 +92,5 @@ index 7e79ba5..1545a61 100644
+ }
}
--
2.1.0
2.1.4

109
CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch
View file

@ -1,109 +0,0 @@
From 6d797dbaf72c252361504a9c7b991a162876aa40 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:09:45 +1000
Subject: [PATCH] More Efficient Chunk Save Queue
Optimizes the data structures behind the chunk save queue into ones more suitable for the type of data and access which they are used for.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 044a09d..b7d09a9 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -16,8 +16,11 @@ import org.apache.logging.log4j.Logger;
public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
private static final Logger a = LogManager.getLogger();
- private List<ChunkRegionLoader.PendingChunkToSave> b = Lists.newArrayList();
- private Set<ChunkCoordIntPair> c = Sets.newHashSet();
+ // Spigot start
+ private java.util.LinkedHashMap<ChunkCoordIntPair, PendingChunkToSave> pendingSaves = new java.util.LinkedHashMap<ChunkCoordIntPair, PendingChunkToSave>();
+ // private List<ChunkRegionLoader.PendingChunkToSave> b = Lists.newArrayList();
+ // private Set<ChunkCoordIntPair> c = Sets.newHashSet();
+ // Spigot end
private Object d = new Object();
private final File e;
@@ -30,13 +33,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
synchronized (this.d) {
- if (this.c.contains(chunkcoordintpair)) {
- for (int k = 0; k < this.b.size(); ++k) {
- if (((PendingChunkToSave) this.b.get(k)).a.equals(chunkcoordintpair)) {
- return true;
- }
- }
- }
+ // Spigot start
+ if (pendingSaves.containsKey(chunkcoordintpair)) {
+ return true;
+ }
+ // Spigot end
}
return RegionFileCache.a(this.e, i, j).chunkExists(i & 31, j & 31);
@@ -63,14 +64,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
Object object = this.d;
synchronized (this.d) {
- if (this.c.contains(chunkcoordintpair)) {
- for (int k = 0; k < this.b.size(); ++k) {
- if (((ChunkRegionLoader.PendingChunkToSave) this.b.get(k)).a.equals(chunkcoordintpair)) {
- nbttagcompound = ((ChunkRegionLoader.PendingChunkToSave) this.b.get(k)).b;
- break;
- }
- }
+ // Spigot start
+ PendingChunkToSave pendingchunktosave = pendingSaves.get(chunkcoordintpair);
+ if (pendingchunktosave != null) {
+ nbttagcompound = pendingchunktosave.b;
}
+ // Spigot end
}
if (nbttagcompound == null) {
@@ -149,17 +148,14 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
Object object = this.d;
synchronized (this.d) {
- if (this.c.contains(chunkcoordintpair)) {
- for (int i = 0; i < this.b.size(); ++i) {
- if (((ChunkRegionLoader.PendingChunkToSave) this.b.get(i)).a.equals(chunkcoordintpair)) {
- this.b.set(i, new ChunkRegionLoader.PendingChunkToSave(chunkcoordintpair, nbttagcompound));
- return;
- }
- }
+ // Spigot start
+ if (this.pendingSaves.put(chunkcoordintpair, new PendingChunkToSave(chunkcoordintpair, nbttagcompound)) != null) {
+ return;
}
- this.b.add(new ChunkRegionLoader.PendingChunkToSave(chunkcoordintpair, nbttagcompound));
- this.c.add(chunkcoordintpair);
+ // this.b.add(new ChunkRegionLoader.PendingChunkToSave(chunkcoordintpair, nbttagcompound));
+ // this.c.add(chunkcoordintpair);
+ // Spigot end
FileIOThread.a().a(this);
}
}
@@ -169,12 +165,14 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
Object object = this.d;
synchronized (this.d) {
- if (this.b.isEmpty()) {
+ // Spigot start
+ if (this.pendingSaves.isEmpty()) {
return false;
}
- chunkregionloader_pendingchunktosave = (ChunkRegionLoader.PendingChunkToSave) this.b.remove(0);
- this.c.remove(chunkregionloader_pendingchunktosave.a);
+ chunkregionloader_pendingchunktosave = this.pendingSaves.values().iterator().next();
+ this.pendingSaves.remove(chunkregionloader_pendingchunktosave.a);
+ // Spigot end
}
if (chunkregionloader_pendingchunktosave != null) {
--
2.1.0

10
CraftBukkit-Patches/0010-Async-Operation-Catching.patch → CraftBukkit-Patches/0009-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From ea3e297e50d376728766ad0cb08ba72ffb81e3a7 Mon Sep 17 00:00:00 2001
From f1fbe73a279beb21f8f68866cd39e0938b58ab9c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -26,7 +26,7 @@ index 6b02059..66e099f 100644
public int a(Random random) {
return 1;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 9973ff7..256953f 100644
index 40ae494..2e81b7e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -570,6 +570,7 @@ public abstract class EntityLiving extends Entity {
@ -78,7 +78,7 @@ index 5ef2be4..8d50e05 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.d(this.tracker);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7b933b8..d238c81 100644
index abc39f1..b4ed484 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess {
@ -134,7 +134,7 @@ index 80fc5bf..441f8a3 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 c1879f4..37f04ad 100644
index 9396b93..fa7b91c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -181,5 +181,5 @@ index 0000000..4b3aa85
+ }
+}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0011-View-Distance.patch → CraftBukkit-Patches/0010-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 82ace6763d2f76de660ec454ed803eb8ddefa14e Mon Sep 17 00:00:00 2001
From d9fedfa532dd1f937fcea3a779a1fd0a2b9dce7f 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
@ -22,7 +22,7 @@ index 688d6f0..abb24c8 100644
public WorldServer a() {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5fd3934..ea9e2fb 100644
index 03cac6e..b245159 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -62,7 +62,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -51,5 +51,5 @@ index 1545a61..6cc3a91 100644
+ }
}
--
2.1.0
2.1.4

62
CraftBukkit-Patches/0012-Spigot-Timings.patch → CraftBukkit-Patches/0011-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 2b98747833a588469352c523a5b5dd56ddf789b7 Mon Sep 17 00:00:00 2001
From 05dd86d1ddf919552e07ec557d26e55757fe4be6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -56,10 +56,10 @@ index 9bd173b..74710f9 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index b7d09a9..5c0ab6c 100644
index cfd28f1..ad989e6 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -46,7 +46,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -41,7 +41,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
// CraftBukkit start - Add async variant, provide compatibility
public Chunk a(World world, int i, int j) throws IOException {
@ -69,7 +69,7 @@ index b7d09a9..5c0ab6c 100644
if (data != null) {
Chunk chunk = (Chunk) data[0];
NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
@@ -399,7 +401,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -379,7 +381,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
// CraftBukkit end
@ -78,7 +78,7 @@ index b7d09a9..5c0ab6c 100644
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) {
@@ -425,7 +427,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -405,7 +407,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -88,7 +88,7 @@ index b7d09a9..5c0ab6c 100644
NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10);
if (nbttaglist2 != null) {
@@ -438,6 +441,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -418,6 +421,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -97,7 +97,7 @@ index b7d09a9..5c0ab6c 100644
if (nbttagcompound.hasKeyOfType("TileTicks", 9)) {
NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10);
@@ -457,6 +462,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -437,6 +442,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -106,7 +106,7 @@ index b7d09a9..5c0ab6c 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 8bc6ad6..1e682e9 100644
index fc5e8cf..3d5801c 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -20,6 +20,7 @@ import java.io.PrintStream;
@ -120,7 +120,7 @@ index 8bc6ad6..1e682e9 100644
@@ -369,6 +370,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void aN() {
public void aO() {
+ SpigotTimings.serverCommandTimer.startTiming(); // Spigot
while (!this.l.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.l.remove(0);
@ -132,7 +132,7 @@ index 8bc6ad6..1e682e9 100644
+ SpigotTimings.serverCommandTimer.stopTiming(); // Spigot
}
public boolean ad() {
public boolean ae() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d004df3..d3c7d1b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
@ -171,7 +171,7 @@ index d004df3..d3c7d1b 100644
private void recalcPosition() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 296ec31..1b11563 100644
index 2e81b7e..0638f6f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@ -242,7 +242,7 @@ index 296ec31..1b11563 100644
this.world.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 611a623..af2e9bc 100644
index 4393458..1cc4e47 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -46,6 +46,7 @@ import joptsimple.OptionSet;
@ -253,15 +253,15 @@ index 611a623..af2e9bc 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -613,6 +614,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
protected void y() {}
@@ -619,6 +620,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
protected void z() {}
protected void z() throws ExceptionWorldConflict { // CraftBukkit - added throws
protected void A() throws ExceptionWorldConflict { // CraftBukkit - added throws
+ SpigotTimings.serverTickTimer.startTiming(); // Spigot
long i = System.nanoTime();
++this.ticks;
@@ -639,10 +641,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -645,10 +647,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@ -274,7 +274,7 @@ index 611a623..af2e9bc 100644
}
this.methodProfiler.a("tallying");
@@ -659,6 +663,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -665,6 +669,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.b();
this.methodProfiler.b();
@ -282,8 +282,8 @@ index 611a623..af2e9bc 100644
+ org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
public void A() {
@@ -673,16 +679,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
public void B() {
@@ -679,16 +685,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.c("levels");
@ -307,7 +307,7 @@ index 611a623..af2e9bc 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
@@ -690,6 +703,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -696,6 +709,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
}
}
@ -315,7 +315,7 @@ index 611a623..af2e9bc 100644
int i;
@@ -713,7 +727,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -719,7 +733,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
CrashReport crashreport;
try {
@ -325,7 +325,7 @@ index 611a623..af2e9bc 100644
} catch (Throwable throwable) {
crashreport = CrashReport.a(throwable, "Exception ticking world");
worldserver.a(crashreport);
@@ -721,7 +737,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -727,7 +743,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
try {
@ -335,7 +335,7 @@ index 611a623..af2e9bc 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
worldserver.a(crashreport);
@@ -730,7 +748,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -736,7 +754,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -345,12 +345,12 @@ index 611a623..af2e9bc 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -739,14 +759,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -745,14 +765,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
this.methodProfiler.c("connection");
+ SpigotTimings.connectionTimer.startTiming(); // Spigot
this.ap().c();
this.aq().c();
+ SpigotTimings.connectionTimer.stopTiming(); // Spigot
this.methodProfiler.c("players");
+ SpigotTimings.playerListTimer.startTiming(); // Spigot
@ -367,10 +367,10 @@ index 611a623..af2e9bc 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a295e61..eb977e1 100644
index 2ed67e6..424ac34 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1067,6 +1067,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1063,6 +1063,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
// CraftBukkit end
private void handleCommand(String s) {
@ -378,7 +378,7 @@ index a295e61..eb977e1 100644
// CraftBukkit start - whole method
this.c.info(this.player.getName() + " issued server command: " + s);
@@ -1076,18 +1077,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1072,18 +1073,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -419,7 +419,7 @@ index d80bbaf..02c9250 100644
private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
private static Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d238c81..47778d1 100644
index b4ed484..3e5933a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -21,6 +21,7 @@ import org.bukkit.Bukkit;
@ -529,7 +529,7 @@ index d238c81..47778d1 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ea9e2fb..1d1ea9b 100644
index b245159..fba6814 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -223,10 +223,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -888,5 +888,5 @@ index 55db3ff..220e39a 100644
+ // Spigot end
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch → CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 1de46ca9b9cf24e5395870c44fbc8bde1888d324 Mon Sep 17 00:00:00 2001
From 4d2e521609df2f20d5d1756066d443c9a1c9e800 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -66,7 +66,7 @@ index f22e695..3d8d59a 100644
public boolean d(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 1b9af34..aeb0a44 100644
index cc1b347..3964e3f 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -19,6 +19,25 @@ public final class SpawnerCreature {
@ -160,5 +160,5 @@ index 6cc3a91..46249d7 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch → CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch
View file

@ -1,11 +1,11 @@
From af2e7fe5737f5cb423b3467d68d2982c18e7152f Mon Sep 17 00:00:00 2001
From b307f13c5fa5ce775d86513090bf31effd770a40 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 47778d1..1ada35c 100644
index 3e5933a..380df75 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1365,6 +1365,13 @@ public abstract class World implements IBlockAccess {
@ -23,5 +23,5 @@ index 47778d1..1ada35c 100644
if (!tileentity.x() && tileentity.t()) {
BlockPosition blockposition = tileentity.getPosition();
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0015-Entity-Activation-Range.patch → CraftBukkit-Patches/0014-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From f1bfa6ab1613581aca6fa04da6012b40d1f6d1a0 Mon Sep 17 00:00:00 2001
From 3986a3a267b59d1b45e2a8dac33e47354f074ef1 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
@ -178,7 +178,7 @@ index fa7e6df..65a03df 100644
// Spigot start
double radius = world.spigotConfig.itemMerge;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 24aaec5..e90ff2f 100644
index 0638f6f..f7ce391 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -89,6 +89,13 @@ public abstract class EntityLiving extends Entity {
@ -196,7 +196,7 @@ index 24aaec5..e90ff2f 100644
public void G() {
this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1ada35c..38ebdbb 100644
index 380df75..f82c0f9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1306,6 +1306,7 @@ public abstract class World implements IBlockAccess {
@ -547,5 +547,5 @@ index 46249d7..ed2836a 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0016-Metrics.patch → CraftBukkit-Patches/0015-Metrics.patch
View file

@ -1,4 +1,4 @@
From 66597de8d72d0406c2197198d5e5fcdfa7f3bc82 Mon Sep 17 00:00:00 2001
From f7aa249e67cd5daf82a35fbc0478ba59aac38ef7 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
@ -687,5 +687,5 @@ index 6837305..fdd4fe1 100644
static void readConfig(Class<?> clazz, Object instance)
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch → CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
View file

@ -1,4 +1,4 @@
From b9f6f612efda2ede563c17125596cc5e54ff0e79 Mon Sep 17 00:00:00 2001
From ce05d40e7bb517074413745ed2c76007e19f9208 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
@ -48,5 +48,5 @@ index 3752690..b51da0e 100644
--this.count;
if (entityliving instanceof EntityHuman) {
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch → CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch
View file

@ -1,4 +1,4 @@
From 399e361d713bd3a7b8eba3728eca47825bb1436b Mon Sep 17 00:00:00 2001
From 070fb153a784c543bef263e110b898153ec5a410 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
@ -23,5 +23,5 @@ index 42a6f9a..43adfcc 100644
System.arraycopy(revertComponents(sign.lines), 0, lines, 0, lines.length);
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch → CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch
View file

@ -1,4 +1,4 @@
From de781fce458bd94f7866fdb158b5fba13de13829 Mon Sep 17 00:00:00 2001
From 1ede51990c49d26cdf03d07b30651253351fbc26 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
@ -144,5 +144,5 @@ index 0000000..4bf4d2a
+ }
+}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch → CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch
View file

@ -1,4 +1,4 @@
From 86b09d2c88797b0cd766b42cbe99bc9c550130f1 Mon Sep 17 00:00:00 2001
From ac9d4469b570ec354dcd1de18efd608d5adb72b7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:50:27 +1000
Subject: [PATCH] Thread Naming and Tweaks
@ -19,5 +19,5 @@ index 8442ecb..93d8d42 100644
private CraftAsyncDebugger debugTail = debugHead;
private static final int RECENT_TICKS;
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch → CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch
View file

@ -1,4 +1,4 @@
From 19084b00141da1144834e53a13ae19eeb6025bfa Mon Sep 17 00:00:00 2001
From 721126a58307ce4e03a21b7b2b3f3337d2913a32 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
@ -54,5 +54,5 @@ index ed0c30c..58d52d8 100644
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0022-Remove-o-Option.patch → CraftBukkit-Patches/0021-Remove-o-Option.patch
View file

@ -1,4 +1,4 @@
From 5ba03eacbb86f53d5367f4df5cae52d6c7d47fc6 Mon Sep 17 00:00:00 2001
From ec8a71fafe7d11b9fc2a7e40e9b91c055390f2c8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option
@ -19,5 +19,5 @@ index dbb329c..0549a0f 100644
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0023-Recipe-Deconstruction.patch → CraftBukkit-Patches/0022-Recipe-Deconstruction.patch
View file

@ -1,4 +1,4 @@
From d2104f7ad03dddaa13e03959f674738335702d85 Mon Sep 17 00:00:00 2001
From 95511de518572ab8d52f51332c06bb67babbf0af Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 1 Jun 2013 16:34:38 +1000
Subject: [PATCH] Recipe Deconstruction
@ -67,5 +67,5 @@ index b13dcb7..aa0e9aa 100644
+ // Spigot end
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0024-Implement-Arrow-API.patch → CraftBukkit-Patches/0023-Implement-Arrow-API.patch
View file

@ -1,4 +1,4 @@
From a17bb69d10a158dbc6eb6730fdba2c1d56e14bc0 Mon Sep 17 00:00:00 2001
From 6abcfb10cc45520d7c7a0afda68cc24e5ddda18f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API
@ -27,5 +27,5 @@ index bf48e6e..ad489cc 100644
public Arrow.Spigot spigot()
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0025-Hopper-Customisations.patch → CraftBukkit-Patches/0024-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 130aa064894ff26076d5878a79b7859a50bcfe60 Mon Sep 17 00:00:00 2001
From 3ed10d5c7954889a72db5cf893bd75f9f6ecf196 Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations
@ -121,5 +121,5 @@ index 6421bf2..956c628 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch → CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From 3571d158bf5b247a039862f71f3e397e1cbc6630 Mon Sep 17 00:00:00 2001
From 8f680acc75bec4ef8a27cdb4b71056d02355023f Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent.
Adds BUKKIT-267
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 8d668fa..41cfde8 100644
index 056d447..0695fe2 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -4,7 +4,11 @@ import com.google.common.collect.Lists;
@ -99,5 +99,5 @@ index 10ac959..c5eca56 100644
*/
public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, EnumDirection clickedFace, ItemStack itemInHand) {
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch → CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch
View file

@ -1,4 +1,4 @@
From 863d3be198da29ff4be6f1a696f9be5493ae0d02 Mon Sep 17 00:00:00 2001
From 6e6fc1caba9b757166acd19bc230cbd2a56acb97 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 15 Jun 2013 21:34:48 +1000
Subject: [PATCH] Firework Meta Crash Fix
@ -27,5 +27,5 @@ index 0f7da6b..5a409ae 100644
}
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch → CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,14 +1,14 @@
From ab69bfc5ab7eaa0ef4fb1f568a2b0d88181d122d Mon Sep 17 00:00:00 2001
From 3dfd4fc0ed6077dabd6e87ab6efe7b3d6c1aae5e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index eb977e1..8e18c9f 100644
index 424ac34..84391af 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1069,6 +1069,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1065,6 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
private void handleCommand(String s) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method
@ -32,5 +32,5 @@ index fdd4fe1..4e7d731 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch → CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From fbd2a42dafb35e0006af03366228b9f2420bda39 Mon Sep 17 00:00:00 2001
From c5036b414c5ac505bf0687b9abf70d96de66c32f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -49,5 +49,5 @@ index 4e7d731..0a6ab75 100644
+ }
}
--
2.1.0
2.1.4

20
CraftBukkit-Patches/0030-Configurable-Messages.patch → CraftBukkit-Patches/0029-Configurable-Messages.patch
View file

@ -1,29 +1,29 @@
From 037faafb5dcab4a1ebd392c62279d0d8b580c13d Mon Sep 17 00:00:00 2001
From 27d753cee3b24229e5624bf976d48fa7db2e9bfa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index 98f40f1..8f421f3 100644
index ef70306..b34a59a 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.b() > 47) {
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.3");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.3" ) ); // Spigot
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.4");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.4" ) ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
this.b.close(chatcomponenttext);
} else if (packethandshakinginsetprotocol.b() < 47) {
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.3");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.3" ) ); // Spigot
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.4");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.4" ) ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
this.b.close(chatcomponenttext);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index ba7f18c..146e186 100644
index cb84736..0278cfd 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -418,7 +418,7 @@ public abstract class PlayerList {
@ -37,8 +37,8 @@ index ba7f18c..146e186 100644
@@ -432,7 +432,7 @@ public abstract class PlayerList {
} else {
// return this.players.size() >= this.maxPlayers ? "The server is full!" : null;
if (this.players.size() >= this.maxPlayers) {
// return this.players.size() >= this.maxPlayers && !this.f(gameprofile) ? "The server is full!" : null;
if (this.players.size() >= this.maxPlayers && !this.f(gameprofile)) {
- event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full");
+ event.disallow(PlayerLoginEvent.Result.KICK_FULL, org.spigotmc.SpigotConfig.serverFullMessage); // Spigot
}
@ -103,5 +103,5 @@ index 0a6ab75..95bb141 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch → CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch
View file

@ -1,4 +1,4 @@
From 0f6874fc64b8c59546c8feb06ac4b55406e7c870 Mon Sep 17 00:00:00 2001
From a5f3fdc2728151d8feb670f039ee8f12d3965094 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,7 +18,7 @@ index 3d8d59a..3e72a01 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 38ebdbb..51db92b 100644
index f82c0f9..a08b401 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2090,7 +2090,7 @@ public abstract class World implements IBlockAccess {
@ -47,5 +47,5 @@ index 956c628..8868ea3 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0032-Properly-Close-Inventories.patch → CraftBukkit-Patches/0031-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From f9b3ce359dec5ce732e67d97a11902a97d07ccd7 Mon Sep 17 00:00:00 2001
From a79c65358468bef6a3b73c0704727e9bfbcb7a66 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories
@ -65,5 +65,5 @@ index 712018a..17b5714 100644
super.c(i);
}
--
2.1.0
2.1.4

12
CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch → CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch
View file

@ -1,27 +1,27 @@
From d4e1a324eb84acc9fc1b3e967292ee784beae6bf Mon Sep 17 00:00:00 2001
From 5b6b5953ac1e6b01b07f1759de74402c18ce9985 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8e18c9f..2786399 100644
index 84391af..4fa290c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1204,6 +1204,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1200,6 +1200,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);
+ // Spigot Start
+ if ( entity == player && !player.v() ) // RENAME
+ if ( entity == player && !player.isSpectator() )
+ {
+ disconnect( "Cannot interact with self!" );
+ return;
+ }
+ // Spigot End
this.player.z();
this.player.resetIdleTimer();
if (entity != null) {
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch → CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,4 +1,4 @@
From bf4b8c82cbefc7486951a102c970175a9ab3cf42 Mon Sep 17 00:00:00 2001
From 0a8a5051bd17ec33126f3ff7c71fdca402b46d27 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events
@ -36,5 +36,5 @@ index ebdcaab..5cf3833 100644
this.vehicle.passenger = null;
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch → CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From 3d9e77b93341a7b7b6a37548cb8dcf1352289344 Mon Sep 17 00:00:00 2001
From a08a33d56eda8fe5b45e66314979bed9669cec66 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 146e186..38c904c 100644
index 0278cfd..7b2d8d1 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -548,6 +548,11 @@ public abstract class PlayerList {
@ -22,5 +22,5 @@ index 146e186..38c904c 100644
location = respawnEvent.getRespawnLocation();
entityplayer.reset();
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch → CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch
View file

@ -1,4 +1,4 @@
From c5379e4dbba8cc9843f13fcc1789a79c9c49708d Mon Sep 17 00:00:00 2001
From 0036e4c68ff2be406d4cd8baaca791c1ceb11be2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:02:59 +1000
Subject: [PATCH] Plug World Unload Memory Leak
@ -18,5 +18,5 @@ index 125cefe..6a7e7b3 100644
private boolean a(World world, BlockPosition blockposition, boolean flag) {
--
2.1.0
2.1.4

12
CraftBukkit-Patches/0037-Player-Collision-API.patch → CraftBukkit-Patches/0036-Player-Collision-API.patch
View file

@ -1,11 +1,11 @@
From 68cfae5df64b4d24920ffe1eb8cc3077be5e7b9b Mon Sep 17 00:00:00 2001
From 2c358306a438d0788be1ea76c8d2506af0339b7c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 55340ab..96ed585 100644
index 4012570..32dd2e1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -25,7 +25,7 @@ index 55340ab..96ed585 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index bbae608..c6244a5 100644
index f7ce391..9cd8e9b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1674,7 +1674,7 @@ public abstract class EntityLiving extends Entity {
@ -38,7 +38,7 @@ index bbae608..c6244a5 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index aefed46..657f3f5 100644
index d356e7e..1fd636c 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -64,7 +64,7 @@ index aefed46..657f3f5 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 37f04ad..1464b71 100644
index fa7b91c..671b7d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1318,6 +1318,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -88,5 +88,5 @@ index 37f04ad..1464b71 100644
public Player.Spigot spigot()
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch → CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch
View file

@ -1,14 +1,14 @@
From 4def204e17258bdd3fda7a5d062912a00969ed21 Mon Sep 17 00:00:00 2001
From a13398ce78acf3168b87dca55bbc1f09e98d9c13 Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index af2e9bc..7f70a3c 100644
index 1cc4e47..a0634f8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -653,11 +653,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -659,11 +659,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.h[this.ticks % 100] = System.nanoTime() - i;
this.methodProfiler.b();
this.methodProfiler.a("snooper");
@ -23,5 +23,5 @@ index af2e9bc..7f70a3c 100644
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch → CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,4 +1,4 @@
From 570225b4711c17a964b278632338a943262f9719 Mon Sep 17 00:00:00 2001
From 36684b471f15cbc884e2ffadcaf4939ca4b7b11f Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
@ -21,5 +21,5 @@ index 7a9b11c..9df27e3 100644
public Spigot spigot()
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch → CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch
View file

@ -1,11 +1,11 @@
From beee189a8992143e0c6d086dbb3591b57fd0c12a Mon Sep 17 00:00:00 2001
From 2fb345e4d4a21458d0ca773fc34ee524f4c8eb81 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1464b71..ad8d2d1 100644
index 671b7d2..5136adf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -27,5 +27,5 @@ index 1464b71..ad8d2d1 100644
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch → CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
View file

@ -1,11 +1,11 @@
From a26c1ec440045d300f1fc7ad93dd2dcb33947be3 Mon Sep 17 00:00:00 2001
From c58898dd419d22d44ad3d407eadd11262917522d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 14 Sep 2013 10:16:38 +1000
Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 96ed585..2004d67 100644
index 32dd2e1..51f196a 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -300,6 +300,10 @@ public abstract class EntityHuman extends EntityLiving {
@ -20,5 +20,5 @@ index 96ed585..2004d67 100644
return;
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch → CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
View file

@ -1,4 +1,4 @@
From a46fe8cad440e523c65e214bab8ccdb10caf8183 Mon Sep 17 00:00:00 2001
From b1984765de72f5464d00e8041ba7244daf960397 Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com>
Date: Tue, 16 Jul 2013 22:34:50 +0200
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
@ -22,5 +22,5 @@ index f15b199..40c0a87 100644
world.setAir(blockposition);
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch → CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch
View file

@ -1,4 +1,4 @@
From 4db0facbad643a7db5ec75b7d0538a436078a10a Mon Sep 17 00:00:00 2001
From df701f7e9d4f96e779b7a928cfa5600f63475886 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 21 Sep 2013 12:33:09 +1000
Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
@ -46,5 +46,5 @@ index 8868ea3..0d5c9d0 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0044-Item-Despawn-Rate.patch → CraftBukkit-Patches/0043-Item-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From 4dc98a7a9954aa33ee61797408d4ece977c0053c Mon Sep 17 00:00:00 2001
From d1c7dec33fba2fb2a07abf7d74c239e4f20e58b8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate
@ -34,5 +34,5 @@ index 0d5c9d0..a5786ea 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch → CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch
View file

@ -1,11 +1,11 @@
From ea79c836f34f613e75e1d40a5359210125ab3ae0 Mon Sep 17 00:00:00 2001
From 1f4be3eb66fa4ad635fd29c339d43115d3369577 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2786399..a1341a7 100644
index 7236d36..f965946 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -109,6 +109,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -45,5 +45,5 @@ index 2786399..a1341a7 100644
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0046-Implement-respawn-API.patch → CraftBukkit-Patches/0045-Implement-respawn-API.patch
View file

@ -1,11 +1,11 @@
From 1078ef77535c4d6446133563451413aa0d614575 Mon Sep 17 00:00:00 2001
From 34ce2fb1acc2f55ff365ac51faa4f6ef202a7997 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ad8d2d1..d606824 100644
index 5136adf..a5b7b75 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1331,6 +1331,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -25,5 +25,5 @@ index ad8d2d1..d606824 100644
public Player.Spigot spigot()
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch → CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From c197a85d77fe530ec157f29f592865af3db2e28d Mon Sep 17 00:00:00 2001
From 67f884819439a51b10a77eeb39c3a44ff12354df Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate
@ -34,5 +34,5 @@ index a5786ea..af0c4b2 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch → CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch
View file

@ -1,4 +1,4 @@
From 3fea6f77514417d13d3172eb4390c5f96de69d90 Mon Sep 17 00:00:00 2001
From b60d99eed5bc5e599fb908aaf00a26e5456c4a38 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 17:52:14 +1100
Subject: [PATCH] Fix packed ice generation
@ -34,5 +34,5 @@ index dcd085a..3d08a82 100644
--l1;
if (l1 <= 0) {
--
2.1.0
2.1.4

16
CraftBukkit-Patches/0049-Watchdog-Thread.patch → CraftBukkit-Patches/0048-Watchdog-Thread.patch
View file

@ -1,27 +1,27 @@
From 9d316ba709ca5eda5977fa6caa7ee8362fed3f2b Mon Sep 17 00:00:00 2001
From 7e4e39b4753cc3b320d449991267f354ffd29eb4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 1e682e9..ae9e255 100644
index 3d5801c..33b69c1 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -271,7 +271,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
// CraftBukkit end
- if (this.aR() > 0L) {
+ if (false && this.aR() > 0L) { // Spigot - disable
- if (this.aS() > 0L) {
+ if (false && this.aS() > 0L) { // Spigot - disable
Thread thread1 = new Thread(new ThreadWatchdog(this));
thread1.setName("Server Watchdog");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7f70a3c..b5cb217 100644
index a0634f8..270d318 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -563,6 +563,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -569,6 +569,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.a(crashreport);
} finally {
try {
@ -29,7 +29,7 @@ index 7f70a3c..b5cb217 100644
this.isStopped = true;
this.stop();
} catch (Throwable throwable1) {
@@ -663,6 +664,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -669,6 +670,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.b();
this.methodProfiler.b();
@ -314,5 +314,5 @@ index 0000000..de08ad6
+ }
+}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch → CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch
View file

@ -1,4 +1,4 @@
From bd63427a6f92101ddffc41dc923144b9802cd5a8 Mon Sep 17 00:00:00 2001
From 7296edaa1cb0aed224ca1236d4a1a6bdb38a17fb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 3 Dec 2013 11:07:48 +1100
Subject: [PATCH] Clear Flower Pot on Drop
@ -17,5 +17,5 @@ index fd77047..ce46138 100644
super.remove(world, blockposition, iblockdata);
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch → CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch
View file

@ -1,4 +1,4 @@
From bd7c015caedbf1629a239f71d5145902213094d6 Mon Sep 17 00:00:00 2001
From f4f1f5df831c99edd7cb8546ac56bd4d75909655 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 2 Dec 2013 23:42:09 +0000
Subject: [PATCH] Fix some chunks not being sent to the client
@ -26,5 +26,5 @@ index 7e56837..5208dbc 100644
public ChunkCoordIntPair j() {
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch → CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch
View file

@ -1,4 +1,4 @@
From 651e0447c43452c4d80b1d7d379ce874488e80a1 Mon Sep 17 00:00:00 2001
From c0112295cbbcacd4c9b4ff1a64ac61de98b2778d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 5 Dec 2013 13:55:53 +1100
Subject: [PATCH] Fix Broken Async Chat
@ -35,5 +35,5 @@ index 0ab90f3..18358b4 100644
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0053-Orebfuscator.patch → CraftBukkit-Patches/0052-Orebfuscator.patch
View file

@ -1,4 +1,4 @@
From 627c92006e29f83d04674a54f5cb603d4a94c0fb Mon Sep 17 00:00:00 2001
From 87928bb1ce8d5547d586ec23cbf91ea502e22f99 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator
@ -91,7 +91,7 @@ index 0301fba..7a84a95 100644
public void a(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 51db92b..c1789a0 100644
index a08b401..e9211fe 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -497,6 +497,7 @@ public abstract class World implements IBlockAccess {
@ -410,5 +410,5 @@ index af0c4b2..c390381 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0054-Optimize-DataWatcher.patch → CraftBukkit-Patches/0053-Optimize-DataWatcher.patch
View file

@ -1,4 +1,4 @@
From 02b73438dc5dc43d338764bf2ab9b4a5d3432d52 Mon Sep 17 00:00:00 2001
From edb9783da1c312bc10c43a07095bddf53935e043 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:45:47 +1100
Subject: [PATCH] Optimize DataWatcher
@ -133,5 +133,5 @@ index 2bf9196..aa46c28 100644
public static class WatchableObject {
--
2.1.0
2.1.4

16
CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch → CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch
View file

@ -1,11 +1,11 @@
From 09291ad2c4942d9be3524f19ceabd46940e384b3 Mon Sep 17 00:00:00 2001
From c948544e80b194dd53b68464dc3b120549323a40 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 50beec2..9bfb5a2 100644
index 97c88ea..1fa9626 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -13,6 +13,7 @@ import java.util.Arrays;
@ -42,7 +42,7 @@ index 50beec2..9bfb5a2 100644
EntityPlayer s = this.server.getPlayerList().attemptLogin(this, this.i, hostname);
@@ -133,7 +147,15 @@ public class LoginListener implements PacketLoginInListener, IUpdatePlayerListBo
this.g = LoginListener.EnumProtocolState.KEY;
this.networkManager.handle(new PacketLoginOutEncryptionBegin(this.j, this.server.P().getPublic(), this.e));
this.networkManager.handle(new PacketLoginOutEncryptionBegin(this.j, this.server.Q().getPublic(), this.e));
} else {
- this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
+ // Spigot start
@ -62,7 +62,7 @@ index 50beec2..9bfb5a2 100644
}
+ new LoginHandler().fireEvents();
+ } else if (LoginListener.this.server.S()) {
+ } else if (LoginListener.this.server.T()) {
+ LoginListener.c.warn("Failed to verify username but will let them in anyway!");
+ LoginListener.this.i = LoginListener.this.a(gameprofile);
+ LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
@ -71,7 +71,7 @@ index 50beec2..9bfb5a2 100644
+ LoginListener.c.error("Username \'" + gameprofile.getName() + "\' tried to join with an invalid session"); // CraftBukkit - fix null pointer
+ }
+ } catch (AuthenticationUnavailableException authenticationunavailableexception) {
+ if (LoginListener.this.server.S()) {
+ if (LoginListener.this.server.T()) {
+ LoginListener.c.warn("Authentication servers are down but will let them in anyway!");
+ LoginListener.this.i = LoginListener.this.a(gameprofile);
+ LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
@ -102,7 +102,7 @@ index 50beec2..9bfb5a2 100644
// CraftBukkit end
LoginListener.c.info("UUID of player " + LoginListener.this.i.getName() + " is " + LoginListener.this.i.getId());
LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
- } else if (LoginListener.this.server.S()) {
- } else if (LoginListener.this.server.T()) {
- LoginListener.c.warn("Failed to verify username but will let them in anyway!");
- LoginListener.this.i = LoginListener.this.a(gameprofile);
- LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
@ -111,7 +111,7 @@ index 50beec2..9bfb5a2 100644
- LoginListener.c.error("Username \'" + gameprofile.getName() + "\' tried to join with an invalid session"); // CraftBukkit - fix null pointer
- }
- } catch (AuthenticationUnavailableException authenticationunavailableexception) {
- if (LoginListener.this.server.S()) {
- if (LoginListener.this.server.T()) {
- LoginListener.c.warn("Authentication servers are down but will let them in anyway!");
- LoginListener.this.i = LoginListener.this.a(gameprofile);
- LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
@ -135,5 +135,5 @@ index 50beec2..9bfb5a2 100644
protected GameProfile a(GameProfile gameprofile) {
UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + gameprofile.getName()).getBytes(Charsets.UTF_8));
--
2.1.0
2.1.4

20
CraftBukkit-Patches/0056-BungeeCord-Support.patch → CraftBukkit-Patches/0055-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From db76c7bec6fa44a8942311a28fba5132a5baee28 Mon Sep 17 00:00:00 2001
From b258124c6b30ae28bd727f320a39f80ad23e03a2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
Provides support for IP forwarding via BungeeCord.
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index 8f421f3..727948a 100644
index b34a59a..e5f1f7f 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
@ -45,7 +45,7 @@ index 8f421f3..727948a 100644
}
break;
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 9bfb5a2..5980e91 100644
index b936fb3..98eac81 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -84,9 +84,24 @@ public class LoginListener implements PacketLoginInListener, IUpdatePlayerListBo
@ -75,7 +75,7 @@ index 9bfb5a2..5980e91 100644
// Spigot end
@@ -148,13 +163,19 @@ public class LoginListener implements PacketLoginInListener, IUpdatePlayerListBo
this.networkManager.handle(new PacketLoginOutEncryptionBegin(this.j, this.server.P().getPublic(), this.e));
this.networkManager.handle(new PacketLoginOutEncryptionBegin(this.j, this.server.Q().getPublic(), this.e));
} else {
// Spigot start
- try {
@ -102,13 +102,13 @@ index 9bfb5a2..5980e91 100644
}
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 89d0bc5..6bd1847 100644
index cd67d2b..54298b4 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -64,7 +64,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
public Channel k; // CraftBukkit - public, PAIL: Rename channel
public Channel channel; // CraftBukkit - public
- private SocketAddress l;
+ // Spigot Start
+ public SocketAddress l;
@ -126,7 +126,7 @@ index 89d0bc5..6bd1847 100644
+ // Spigot Start
+ public SocketAddress getRawAddress()
+ {
+ return this.k.remoteAddress();
+ return this.channel.remoteAddress();
+ }
+ // Spigot End
}
@ -144,7 +144,7 @@ index cc5aee0..18d0c6b 100644
this.d = EnumProtocol.a(packetdataserializer.e());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 38c904c..0974884 100644
index 7b2d8d1..7fead36 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -403,7 +403,7 @@ public abstract class PlayerList {
@ -176,7 +176,7 @@ index f0453e6..46710d8 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d606824..08b6f1b 100644
index a5b7b75..28b4647 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1320,6 +1320,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -212,5 +212,5 @@ index c071421..47ab82f 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch → CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch
View file

@ -1,4 +1,4 @@
From 9ba43f6874651943f626511ee2673c07897636b6 Mon Sep 17 00:00:00 2001
From 11387329e86dce40ba8c4c7880c7634b5d52b28f Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
Ability to configure if Zombies will be aggressive towards Villagers.
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 4b56058..2c0c74c 100644
index 91bb046..1a8d3d8 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -38,12 +38,12 @@ public class EntityZombie extends EntityMonster {
@ -41,5 +41,5 @@ index c390381..9c1cd19 100644
+ }
}
--
2.1.0
2.1.4

12
CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch → CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch
View file

@ -1,4 +1,4 @@
From 377e0c3cdf83fde17e57e70f3c8980973a364552 Mon Sep 17 00:00:00 2001
From 24af97a358f9850ec1f6ac4c1b44ac83d61db631 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b5cb217..fd6ecd6 100644
index 270d318..6c6f465 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -63,7 +63,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -27,15 +27,15 @@ index b5cb217..fd6ecd6 100644
this.Z = new UserCache(this, file1);
this.b = this.h();
// this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
@@ -1319,7 +1319,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1325,7 +1325,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
// Spigot End
public ServerConnection ap() {
public ServerConnection aq() {
- return this.q;
+ return this.q == null ? this.q = new ServerConnection(this) : this.q; // Spigot
}
public boolean ar() {
public boolean as() {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 47ab82f..865a17f 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
@ -53,5 +53,5 @@ index 47ab82f..865a17f 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch → CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch
View file

@ -1,4 +1,4 @@
From 4423e0b16f78471a807dbcbc70805d62685a709d Mon Sep 17 00:00:00 2001
From 73905dd9c8dc0033a23ec2aec3bccffe86612863 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 15:21:02 +1100
Subject: [PATCH] Prevent Mineshaft Saving
@ -18,5 +18,5 @@ index bb1a11e..0f8211a 100644
this.d = (PersistentStructure) world.a(PersistentStructure.class, this.a());
} else
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch → CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch
View file

@ -1,14 +1,14 @@
From 34310eefd66d58c67d3b914c47bef7665e6a9f6e Mon Sep 17 00:00:00 2001
From d5949a9c9b33d98719a85a290047bb5f9b4cbe52 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:39:14 +1100
Subject: [PATCH] Log Cause of Unexpected Exceptions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fd6ecd6..3c50861 100644
index 6c6f465..c09a05e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -544,6 +544,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -550,6 +550,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
} catch (Throwable throwable) {
MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
@ -22,5 +22,5 @@ index fd6ecd6..3c50861 100644
if (throwable instanceof ReportedException) {
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0061-Particle-API.patch → CraftBukkit-Patches/0060-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 63d8fa92b3341ead136bef29d489c07a2ca92da0 Mon Sep 17 00:00:00 2001
From cbae29782927717ec9ccde7e4f14a1fef9b983c5 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -132,7 +132,7 @@ index ef1ff3f..5d12a5c 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 08b6f1b..8a6ea4b 100644
index 28b4647..26c932a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -322,9 +322,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -211,5 +211,5 @@ index 08b6f1b..8a6ea4b 100644
public Player.Spigot spigot()
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch → CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch
View file

@ -1,4 +1,4 @@
From 4a9a0705b636f7359bf2a5cfe752b4408f6d7bdc Mon Sep 17 00:00:00 2001
From c16e15a3678f6ca208cbde4d6630ec51a22528a6 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
@ -26,5 +26,5 @@ index 5cf3833..5e1e695 100644
if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch → CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch
View file

@ -1,11 +1,11 @@
From 1c807b738a7524dd87695686f3be58ca1a987cb8 Mon Sep 17 00:00:00 2001
From 8317a3fbd72cb6731287d8df185ff7a8938c16ce Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:17:37 +1000
Subject: [PATCH] More Efficient GetCubes
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c1789a0..c7ef0c5 100644
index e9211fe..9867081 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1104,28 +1104,56 @@ public abstract class World implements IBlockAccess {
@ -82,5 +82,5 @@ index c1789a0..c7ef0c5 100644
double d0 = 0.25D;
List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch → CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View file

@ -1,4 +1,4 @@
From 6f07b5b8fb96bdfa7b2bd48ae6e302f0f175a14c Mon Sep 17 00:00:00 2001
From d69ad84a9b9497da1a7b45a6de8742a714bcb2c5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
@ -17,7 +17,7 @@ index 5e1e695..b930c0d 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index d0769c6..acf0578 100644
index 46f696f..73cdd41 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -457,6 +457,12 @@ public abstract class EntityInsentient extends EntityLiving {
@ -34,7 +34,7 @@ index d0769c6..acf0578 100644
this.bk.a();
this.world.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 41cfde8..df71db5 100644
index 0695fe2..1680918 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -144,6 +144,12 @@ public abstract class MobSpawnerAbstract {
@ -80,5 +80,5 @@ index 9c1cd19..891812a 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch → CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch
View file

@ -1,4 +1,4 @@
From e5173c7e5ab0d3d5df0fc9a537bbe96280c9d650 Mon Sep 17 00:00:00 2001
From 50da834cc12577609c21d18eb8aba1940e1e8ec4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient
@ -32,5 +32,5 @@ index 4e642b7..c5bc388 100644
MinecraftServer.main(options);
} catch (Throwable t) {
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch → CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,11 +1,11 @@
From 64cce691e9666ea0d188c7eee9aeccba95cf5cb8 Mon Sep 17 00:00:00 2001
From 2a802d0791cb9e2658807671a7d3092ab2fef28b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8a6ea4b..023733e 100644
index 26c932a..03d61c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1241,7 +1241,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -18,5 +18,5 @@ index 8a6ea4b..023733e 100644
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
--
2.1.0
2.1.4

14
CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch → CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch
View file

@ -1,4 +1,4 @@
From b684e536974bda077336f113a1962ee31585164c Mon Sep 17 00:00:00 2001
From a851c0d8d864636e9d4fbb63e28af2ed162a8675 Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -6,16 +6,16 @@ Subject: [PATCH] Add Late Bind Option
Add late-bind config option to delay binding until loading is done.
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index ae9e255..188a094 100644
index 33b69c1..8b9c1ef 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -174,6 +174,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.a(MinecraftEncryption.b());
DedicatedServer.LOGGER.info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.Q());
DedicatedServer.LOGGER.info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.R());
+ if (!org.spigotmc.SpigotConfig.lateBind) {
try {
this.ap().a(inetaddress, this.Q());
this.aq().a(inetaddress, this.R());
} catch (IOException ioexception) {
@@ -182,6 +183,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
@ -31,7 +31,7 @@ index ae9e255..188a094 100644
+ if (org.spigotmc.SpigotConfig.lateBind) {
+ try {
+ this.ap().a(inetaddress, this.Q());
+ this.aq().a(inetaddress, this.R());
+ } catch (IOException ioexception) {
+ DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
+ DedicatedServer.LOGGER.warn("The exception was: {}", new Object[] { ioexception.toString()});
@ -40,7 +40,7 @@ index ae9e255..188a094 100644
+ }
+ }
+
if (false && this.aR() > 0L) { // Spigot - disable
if (false && this.aS() > 0L) { // Spigot - disable
Thread thread1 = new Thread(new ThreadWatchdog(this));
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
@ -58,5 +58,5 @@ index 865a17f..f3187f8 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch → CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch
View file

@ -1,4 +1,4 @@
From 0d62500acc28ae30c09959ae8d610e91d0e38939 Mon Sep 17 00:00:00 2001
From 85d94ac5966d8c8464ab51fe828013a4a23b4207 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
@ -89,5 +89,5 @@ index f3187f8..9566cfa 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch → CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch
View file

@ -1,4 +1,4 @@
From f27c285f4893aeeb368b073e33c6d26a302b5d6c Mon Sep 17 00:00:00 2001
From 22f8c3151f8726503d2ec1b1b1c5e2b792d89526 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code
@ -24,5 +24,5 @@ index b51da0e..86b20c7 100644
public boolean usesData() {
--
2.1.0
2.1.4

10
CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch → CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch
View file

@ -1,14 +1,14 @@
From bd1fa40791a90fc608ed46560b9ede8c8e63ea68 Mon Sep 17 00:00:00 2001
From 8975b3c027edb2d69e9912526b57137f402edd0d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3c50861..3dd4201 100644
index c09a05e..f331f41 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -739,7 +739,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -745,7 +745,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
worldserver.doTick();
worldserver.timings.doTick.stopTiming(); // Spigot
} catch (Throwable throwable) {
@ -22,7 +22,7 @@ index 3c50861..3dd4201 100644
worldserver.a(crashreport);
throw new ReportedException(crashreport);
}
@@ -749,7 +755,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -755,7 +761,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
worldserver.tickEntities();
worldserver.timings.tickEntities.stopTiming(); // Spigot
} catch (Throwable throwable1) {
@ -37,5 +37,5 @@ index 3c50861..3dd4201 100644
throw new ReportedException(crashreport);
}
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch → CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From b7877c0289f388e5873a287aba5a6051fe7fbe53 Mon Sep 17 00:00:00 2001
From 906b1664a3c1d0afafbf48e0f399389943eac0be Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Improve AutoSave Mechanism
@ -24,10 +24,10 @@ index 5208dbc..f8bfc2d 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3dd4201..4c254a7 100644
index f331f41..d34c4e9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -651,7 +651,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -657,7 +657,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
SpigotTimings.worldSaveTimer.startTiming(); // Spigot
this.methodProfiler.a("save");
this.v.savePlayers();
@ -70,5 +70,5 @@ index 5d12a5c..a4d396d 100644
world.savingDisabled = oldSave;
} catch (ExceptionWorldConflict ex) {
--
2.1.0
2.1.4

16
CraftBukkit-Patches/0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch → CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View file

@ -1,33 +1,33 @@
From 6b3900f3cc727b5ba9b47a4804235e1e7c6825fc Mon Sep 17 00:00:00 2001
From fa21783447705aa61405d57413882a1973c38907 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
index 3eeed3e..4e9b714 100644
index c6b5f70..13e9d0b 100644
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
@@ -22,6 +22,7 @@ public class NBTTagByteArray extends NBTBase {
@@ -23,6 +23,7 @@ public class NBTTagByteArray extends NBTBase {
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
nbtreadlimiter.a(192L);
int j = datainput.readInt();
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
nbtreadlimiter.a((long) (8 * j));
this.data = new byte[j];
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
index 63c3bf9..1ff0902 100644
index 5f17034..e206e50 100644
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
@@ -26,6 +26,7 @@ public class NBTTagIntArray extends NBTBase {
@@ -27,6 +27,7 @@ public class NBTTagIntArray extends NBTBase {
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws IOException {
nbtreadlimiter.a(192L);
int j = datainput.readInt();
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
nbtreadlimiter.a((long) (32 * j));
this.data = new int[j];
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0073-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch → CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View file

@ -1,4 +1,4 @@
From 94c2df241c96c4b1b49d1dd8ee8bafc6a2868cf7 Mon Sep 17 00:00:00 2001
From e627892badb9a4b39285375080ef679a8939550c Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
@ -34,5 +34,5 @@ index 891812a..1971dbf 100644
+ }
}
--
2.1.0
2.1.4

22
CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch → CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
View file

@ -1,11 +1,11 @@
From 665dccba5d5695f2529e4e4db16b564cdaa8f705 Mon Sep 17 00:00:00 2001
From 5d270b294d73bf43e7394b140068a3d58958224d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 Jan 2014 14:08:35 +1100
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4c254a7..a15d85a 100644
index d34c4e9..04874dd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -120,6 +120,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -21,7 +21,7 @@ index 4c254a7..a15d85a 100644
public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
this.e = proxy;
@@ -497,6 +503,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -503,6 +509,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.isRunning = false;
}
@ -35,15 +35,15 @@ index 4c254a7..a15d85a 100644
public void run() {
try {
if (this.init()) {
@@ -507,38 +520,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.r.setServerInfo(new ServerPing.ServerData("1.8.3", 47));
@@ -513,38 +526,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.r.setServerInfo(new ServerPing.ServerData("1.8.4", 47));
this.a(this.r);
+ // Spigot start
+ Arrays.fill( recentTps, 20 );
+ long lastTick = System.nanoTime(), catchupTime = 0, curTime, wait, tickSection = lastTick;
while (this.isRunning) {
- long j = ay();
- long j = az();
- long k = j - this.ab;
-
- if (k > 2000L && this.ab - this.R >= 15000L) {
@ -68,14 +68,14 @@ index 4c254a7..a15d85a 100644
- i += k;
- this.ab = j;
- if (this.worlds.get(0).everyoneDeeplySleeping()) {
- this.z();
- if (this.worlds.get(0).everyoneDeeplySleeping()) { // CraftBukkit
- this.A();
- i = 0L;
- } else {
- while (i > 50L) {
- MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
- i -= 50L;
- this.z();
- this.A();
- }
+ if ( MinecraftServer.currentTick++ % SAMPLE_INTERVAL == 0 )
+ {
@ -88,7 +88,7 @@ index 4c254a7..a15d85a 100644
+ lastTick = curTime;
- Thread.sleep(Math.max(1L, 50L - i));
+ this.z();
+ this.A();
this.Q = true;
}
+ // Spigot end
@ -161,5 +161,5 @@ index 0000000..be2e31d
+ }
+}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0075-Add-Spigot-Links.patch → CraftBukkit-Patches/0074-Add-Spigot-Links.patch
View file

@ -1,4 +1,4 @@
From be1d9c02d804964523919cac9f71a5f496d812b2 Mon Sep 17 00:00:00 2001
From 46678a89653b1021dde6354ca6974c76418c9923 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:35 +1100
Subject: [PATCH] Add Spigot Links
@ -75,5 +75,5 @@ index 0a5d414..d6bcf5c 100644
command-block-overrides: []
aliases:
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch → CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch
View file

@ -1,4 +1,4 @@
From 1527a785b0971e9b325e25e221727a0045f40bb9 Mon Sep 17 00:00:00 2001
From 3535fbe78a648b3f4de686e9b4e3750c57a4c022 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
@ -39,5 +39,5 @@ index 345a49c..a0d88ec 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch → CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch
View file

@ -1,4 +1,4 @@
From 4464e0c882e1b4a29448557a2257e207f3f06124 Mon Sep 17 00:00:00 2001
From 85f0223660f58d7224bbfd7e7bf3e853638fcf69 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -39,5 +39,5 @@ index a0d88ec..f19d415 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch → CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch
View file

@ -1,11 +1,11 @@
From 0f89431558495b3cd2c769dc50bab770f0cd2ad8 Mon Sep 17 00:00:00 2001
From d5cfbd51ff49e345b3d080b284e986dfb6e473ee Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 28 Jan 2014 20:35:35 +1100
Subject: [PATCH] Allow Configuring Chunks per Packet
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 657f3f5..5751844 100644
index 1fd636c..98b54fe 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -223,7 +223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -34,5 +34,5 @@ index 1971dbf..c7cb20c 100644
+ }
}
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch → CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch
View file

@ -1,11 +1,11 @@
From 5c31df4ceeb0b2cb8b3997dc8cbeeadac7836a25 Mon Sep 17 00:00:00 2001
From 2b5c9c222bfb53b70c60b3b9d8b26512030f8b3f Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 5751844..3854edf 100644
index 98b54fe..3ab1801 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -18,7 +18,7 @@ index 5751844..3854edf 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 023733e..05babef 100644
index 03d61c5..b7d5f28 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1401,6 +1401,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -35,5 +35,5 @@ index 023733e..05babef 100644
public Player.Spigot spigot()
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch → CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch
View file

@ -1,4 +1,4 @@
From b1e0831238da2e176d7af809832d3e7466946d3f Mon Sep 17 00:00:00 2001
From 886fe319aa0b17ffea9899275c07889b3346919e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions
@ -19,7 +19,7 @@ index b930c0d..82accf4 100644
if (entity.passenger != this && entity.vehicle != this) {
if (!entity.noclip && !this.noclip) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c6244a5..99b120a 100644
index 9cd8e9b..0e2f64f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1675,7 +1675,9 @@ public abstract class EntityLiving extends Entity {
@ -61,5 +61,5 @@ index c7cb20c..76ded26 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0081-Fix-dispensing-bone-meal-not-having-the-correct-data.patch → CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
View file

@ -1,4 +1,4 @@
From 7face1b7ce8bf6835aaf7d2b955f421c2836de5c Mon Sep 17 00:00:00 2001
From 86eb3b6d91c8b107d33eacda6c688a929e1f9fe6 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 6 Feb 2014 21:59:20 +0000
Subject: [PATCH] Fix dispensing bone meal not having the correct data value
@ -18,5 +18,5 @@ index f730e97..4d1c04e 100644
BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
if (!BlockDispenser.eventFired) {
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch → CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch
View file

@ -1,14 +1,14 @@
From 19a15e7391ff2f82fce0fef0686aaec22364853d Mon Sep 17 00:00:00 2001
From 34bd1e6741ed279d9536df41fd39e2a8dbb04798 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a1341a7..788300c 100644
index e46c600..dc395e1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -975,9 +975,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -971,9 +971,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
}
@ -57,5 +57,5 @@ index f19d415..8419c28 100644
+ }
}
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch → CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch
View file

@ -1,14 +1,14 @@
From fd8e11bd340ece46dcb8a5cdf1997935728d4ee8 Mon Sep 17 00:00:00 2001
From 1d78f256c07f82478c4cab777dc2b1951e016baf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 54133a7..53fbc3e 100644
index 81289b7..fc52287 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -95,7 +95,7 @@ public class CommandDispatcher extends CommandHandler implements ICommandDispatc
@@ -100,7 +100,7 @@ public class CommandDispatcher extends CommandHandler implements ICommandDispatc
}
}
@ -33,5 +33,5 @@ index 8419c28..f58208e 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch → CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch
View file

@ -1,11 +1,11 @@
From d0ecbea588d703daefabe616b760ea6ed47c99d2 Mon Sep 17 00:00:00 2001
From 0c71ffab145eea2dbaaf80597e04ec1aa88378bd Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 05babef..6224cde 100644
index b7d5f28..19008c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1407,6 +1407,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -28,5 +28,5 @@ index 05babef..6224cde 100644
public Player.Spigot spigot()
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch → CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch
View file

@ -1,14 +1,14 @@
From 1e6077f596837a4ae0328b6a179779f78a41d04f Mon Sep 17 00:00:00 2001
From e69291f969d4c2b4396bd3f1bdf8b7d4a6a05758 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 788300c..78f6444 100644
index dc395e1..bba531c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1701,7 +1701,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1697,7 +1697,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
// CraftBukkit - Add invalidItems check
@ -33,5 +33,5 @@ index f58208e..86c45c6 100644
+ }
}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch → CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch
View file

@ -1,11 +1,11 @@
From 9441ab38aa6f6dcf8a0d96652e204b12d5c0ee7a Mon Sep 17 00:00:00 2001
From 316538f0307e343c7b236f4b9abaf3324368b565 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 20:02:58 +1100
Subject: [PATCH] Cap Channel Registrations
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6224cde..306ac63 100644
index 19008c4..912ac14 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1061,6 +1061,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -17,5 +17,5 @@ index 6224cde..306ac63 100644
server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
}
--
2.1.0
2.1.4

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

@ -1,4 +1,4 @@
From 2d10249e7c0292e22e359915e06c48d7921d8f63 Mon Sep 17 00:00:00 2001
From 9ef3b3f6584c113c485336e448a0e320478f0f18 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
@ -76,5 +76,5 @@ index 86c45c6..4932990 100644
+ }
}
--
2.1.0
2.1.4

10
CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch → CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch
View file

@ -1,4 +1,4 @@
From 606b505960fd5b49dc45cc87a79e08a106ffc85f Mon Sep 17 00:00:00 2001
From e904ef2211f681fcd0a2f4453b1e41080ce11dae Mon Sep 17 00:00:00 2001
From: hcherndon <hcherndon@gmail.com>
Date: Sat, 15 Feb 2014 01:51:20 -0600
Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@ -6,18 +6,18 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 78f6444..66366fc 100644
index bba531c..23a03ce 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2064,7 +2064,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -2060,7 +2060,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
}
// CraftBukkit start - Add "isDisconnected" method
- public final boolean isDisconnected() {
+ public boolean isDisconnected() { // Spigot
return !this.player.joining && !this.networkManager.k.config().isAutoRead();
return !this.player.joining && !this.networkManager.channel.config().isAutoRead();
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch → CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From a936dd8257a14e8645b052fa880425a0f3725565 Mon Sep 17 00:00:00 2001
From ab8b89560a0152efbf8957614a8c1bc1b0480af9 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -82,5 +82,5 @@ index 243e8e5..0bacc83 100644
@Override
--
2.1.0
2.1.4

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

@ -1,4 +1,4 @@
From 616d2a16110d5b81ab5efea5ed557fff01dd154e Mon Sep 17 00:00:00 2001
From 1a8013d61fb93b9d647874ba7cb9e7642bb220e3 Mon Sep 17 00:00:00 2001
From: FrozenBrain <carstenbamsti@googlemail.com>
Date: Sun, 2 Mar 2014 21:13:46 +0100
Subject: [PATCH] Use one PermissibleBase for all Command Blocks
@ -29,5 +29,5 @@ index 1314c74..b339cf3 100644
public boolean isPermissionSet(String name) {
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch → CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch
View file

@ -1,4 +1,4 @@
From 0d1978cea58a7419d6feea9d3218a9d52e1d50e8 Mon Sep 17 00:00:00 2001
From a62a8c6910ee563d988c304a7549b7fc6dde24c6 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 5 Mar 2014 20:27:27 +0000
Subject: [PATCH] Prevent hoppers from loading chunks
@ -17,5 +17,5 @@ index 8e0d254..766f74e 100644
if (block.isTileEntity()) {
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0092-Guard-Entity-List.patch → CraftBukkit-Patches/0091-Guard-Entity-List.patch
View file

@ -1,11 +1,11 @@
From b657c8eff28c9b79470cdb0234281ee0076d5b19 Mon Sep 17 00:00:00 2001
From 9985b3c8eca0679b016de64987fdb7efac14b566 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 10 Mar 2014 09:03:28 +1100
Subject: [PATCH] Guard Entity List
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c7ef0c5..2624563 100644
index 9867081..94481dc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -37,7 +37,32 @@ public abstract class World implements IBlockAccess {
@ -75,5 +75,5 @@ index c7ef0c5..2624563 100644
timings.entityTick.stopTiming(); // Spigot
this.methodProfiler.c("blockEntities");
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch → CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch
View file

@ -1,4 +1,4 @@
From 9396800d9598acc77ff5c7bc3f152221f252649b Mon Sep 17 00:00:00 2001
From 627cefb0736a27110bbf2b434a37fd86d21a3742 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2624563..502a432 100644
index 94481dc..6dc0f2e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1093,6 +1093,7 @@ public abstract class World implements IBlockAccess {
@ -26,5 +26,5 @@ index 2624563..502a432 100644
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch → CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch
View file

@ -1,4 +1,4 @@
From 0e47ee1fa24cd28d8fdd6c65457b16f1a3f41ae5 Mon Sep 17 00:00:00 2001
From 5728fa581275b4ab2284a6b721567323d8a89524 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Tue, 25 Feb 2014 15:15:26 -0400
Subject: [PATCH] Cancellable WitherSkull potion effect
@ -36,5 +36,5 @@ index e169184..f0e627b 100644
if (this.world.getDifficulty() == EnumDifficulty.NORMAL) {
--
2.1.0
2.1.4

10
CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch → CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch
View file

@ -1,4 +1,4 @@
From d9429048c292e4bcaa5409ea686274a6efd3b138 Mon Sep 17 00:00:00 2001
From 598d9e52bcc654a4ef0482b8ecd382e9e27fbf00 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 15 Mar 2014 01:30:05 -0400
Subject: [PATCH] Descriptive kick reasons instead of Nope!
@ -27,7 +27,7 @@ index 82accf4..d6bef0b 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 66366fc..fbab12e 100644
index 23a03ce..ddd03f5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -200,7 +200,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -39,8 +39,8 @@ index 66366fc..fbab12e 100644
return;
}
// CraftBukkit end
@@ -898,7 +898,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.player.z();
@@ -894,7 +894,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.player.resetIdleTimer();
} else {
PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item");
- this.disconnect("Nope!"); // CraftBukkit
@ -49,5 +49,5 @@ index 66366fc..fbab12e 100644
}
--
2.1.0
2.1.4

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

@ -1,11 +1,11 @@
From 695503aa2a5918e866e212082e0c61aa86547722 Mon Sep 17 00:00:00 2001
From 6b7476ff90b5149f42652a389728558a65b15b31 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 29 Mar 2014 13:44:25 -0400
Subject: [PATCH] Configurable dragon death and wither spawn sounds
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 9dec38a..4bdcfc6 100644
index d4ec5fb..fcddd26 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -578,6 +578,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@ -17,7 +17,7 @@ index 9dec38a..4bdcfc6 100644
double deltaLength = Math.sqrt(distanceSquared);
double relativeX = player.locX + (deltaX / deltaLength) * viewDistance;
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index ec19fef..779029c 100644
index 9884a82..fb19bad 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -191,6 +191,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@ -50,5 +50,5 @@ index 76ded26..c06084d 100644
+ }
}
--
2.1.0
2.1.4

8
CraftBukkit-Patches/0097-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch → CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
View file

@ -1,4 +1,4 @@
From e9812cd6340e15f248aa8ccb4f27fe3290de77d0 Mon Sep 17 00:00:00 2001
From 274394202bcfc5682111788a0ed9ed0bb4cc8b6d Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 11 Apr 2014 11:16:34 +0100
Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a15d85a..2cb938c 100644
index 04874dd..0dbe68c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1011,7 +1011,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1017,7 +1017,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
public String getServerModName() {
@ -19,5 +19,5 @@ index a15d85a..2cb938c 100644
public CrashReport b(CrashReport crashreport) {
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch → CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch
View file

@ -1,11 +1,11 @@
From dbbc298bb54d0f001bc3e901058018ca5eca0074 Mon Sep 17 00:00:00 2001
From be79f744090c1b996c8d497e1b5ee2902a78ba9c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 21:23:58 +1000
Subject: [PATCH] Treat Bungee as Online Mode
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
index 31aa200..c1f8ff6 100644
index 51bc8bd..d67539c 100644
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -63,7 +63,7 @@ public class NameReferencingFileConverter {
@ -18,5 +18,5 @@ index 31aa200..c1f8ff6 100644
} else {
String[] astring1 = astring;
--
2.1.0
2.1.4

10
CraftBukkit-Patches/0099-Add-Conversion-Message.patch → CraftBukkit-Patches/0098-Add-Conversion-Message.patch
View file

@ -1,21 +1,21 @@
From 07675c207348156b74a2523d99fe1e8f00dd8c0a Mon Sep 17 00:00:00 2001
From d29b9d3e1a42a524da1bd657afba35115af29577 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 23:30:44 +1000
Subject: [PATCH] Add Conversion Message
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 188a094..28135ba 100644
index 8b9c1ef..9bba97b 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -513,6 +513,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -517,6 +517,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
protected boolean aQ() {
protected boolean aR() {
+ server.getLogger().info( "**** Beginning UUID conversion, this may take A LONG time ****"); // Spigot, let the user know whats up!
boolean flag = false;
int i;
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch → CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
View file

@ -1,4 +1,4 @@
From 91eb07d9af70866b99bc8dcedc6c3fde2836b188 Mon Sep 17 00:00:00 2001
From ac112d63cab52997d71ed72f324e2fd1725d7e33 Mon Sep 17 00:00:00 2001
From: "gjmcferrin@gmail.com" <gjmcferrin@gmail.com>
Date: Mon, 10 Feb 2014 10:05:11 -0500
Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396
@ -22,5 +22,5 @@ index 3cf292f..050a504 100644
}
// CraftBukkit end
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch → CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch
View file

@ -1,11 +1,11 @@
From b97efbfc1fa69802cadb69986f23dabaec0f2b60 Mon Sep 17 00:00:00 2001
From e8b7ffb38699e5c3ec0be74c4a12aa2a475c0e0f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 09:00:59 +1000
Subject: [PATCH] Print Stack on InternalException
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 6bd1847..1c28c940 100644
index 54298b4..27f1d0a 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -111,6 +111,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
@ -17,5 +17,5 @@ index 6bd1847..1c28c940 100644
protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) throws Exception {
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0102-Use-Offline-Player-Data-Once-if-Required.patch → CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch
View file

@ -1,4 +1,4 @@
From c8420a0765b0a714c1039cfc23beff326095e41d Mon Sep 17 00:00:00 2001
From 483b6a7711678c96fd193b60d8cbc4f8e623be31 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 14:41:23 +1000
Subject: [PATCH] Use Offline Player Data Once if Required.
@ -6,7 +6,7 @@ Subject: [PATCH] Use Offline Player Data Once if Required.
If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again.
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index ae78fa2..bb87701 100644
index 616b049..e4b3dd5 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -200,10 +200,28 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@ -39,5 +39,5 @@ index ae78fa2..bb87701 100644
WorldNBTStorage.a.warn("Failed to load player data for " + entityhuman.getName());
}
--
2.1.0
2.1.4

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