OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild patches.

Browse source
This commit is contained in:
md_5 2016-03-02 06:39:42 +11:00 committed by Zach Brown
parent aa90f53d4b
commit ea8cad9f21
15 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From e65f697fae5a24e96c2eb6d5e5e73e0256425022 Mon Sep 17 00:00:00 2001
From 2c942605d485c7bfc6ab5830baabd792f4d76be6 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 449d336..f8274ee 100644
index 318d68a..c226e01 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1263,6 +1263,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1268,6 +1268,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}

24
CraftBukkit-Patches/0010-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 4a83498a6be54b7697c43eba373d11b5aedde899 Mon Sep 17 00:00:00 2001
From b2f4b09f228385ad00401dcd5cbbc0ed058340bf 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
@ -230,7 +230,7 @@ index 0b851a9..dc91f0a 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f8274ee..7985cb2 100644
index c226e01..d754d0d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -45,6 +45,7 @@ import org.bukkit.craftbukkit.CraftServer;
@ -241,7 +241,7 @@ index f8274ee..7985cb2 100644
public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
@@ -617,6 +618,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -622,6 +623,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
protected void B() {}
protected void C() throws ExceptionWorldConflict { // CraftBukkit - added throws
@ -249,7 +249,7 @@ index f8274ee..7985cb2 100644
long i = System.nanoTime();
++this.ticks;
@@ -643,10 +645,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -648,10 +650,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@ -262,7 +262,7 @@ index f8274ee..7985cb2 100644
}
this.methodProfiler.a("tallying");
@@ -663,6 +667,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -668,6 +672,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.b();
this.methodProfiler.b();
@ -271,7 +271,7 @@ index f8274ee..7985cb2 100644
}
public void D() {
@@ -677,16 +683,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -682,16 +688,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.c("levels");
@ -295,7 +295,7 @@ index f8274ee..7985cb2 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) {
@@ -694,6 +707,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -699,6 +712,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
}
}
@ -303,7 +303,7 @@ index f8274ee..7985cb2 100644
int i;
@@ -717,7 +731,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -722,7 +736,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
CrashReport crashreport;
try {
@ -313,7 +313,7 @@ index f8274ee..7985cb2 100644
} catch (Throwable throwable) {
crashreport = CrashReport.a(throwable, "Exception ticking world");
worldserver.a(crashreport);
@@ -725,7 +741,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -730,7 +746,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
try {
@ -323,7 +323,7 @@ index f8274ee..7985cb2 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
worldserver.a(crashreport);
@@ -734,7 +752,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -739,7 +757,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -333,7 +333,7 @@ index f8274ee..7985cb2 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -743,14 +763,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -748,14 +768,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
this.methodProfiler.c("connection");
@ -355,7 +355,7 @@ index f8274ee..7985cb2 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 ab6b36f..a125127 100644
index d3539e1..a8dff8b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1234,6 +1234,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

10
CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
View file

@ -1,14 +1,14 @@
From d90095ba6ee7be68fed4895caf529de47525b900 Mon Sep 17 00:00:00 2001
From 590274e16886d341216e4968fe93470b6a3ade9d 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
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 32d9fd4..acc5bd2 100644
index c06bb0b..1f41f6d 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -335,6 +335,11 @@ public final class ItemStack {
@@ -336,6 +336,11 @@ public final class ItemStack {
}
public boolean isDamaged(int i, Random random) {
@ -20,7 +20,7 @@ index 32d9fd4..acc5bd2 100644
if (!this.e()) {
return false;
} else {
@@ -349,7 +354,16 @@ public final class ItemStack {
@@ -350,7 +355,16 @@ public final class ItemStack {
}
i -= k;
@ -38,7 +38,7 @@ index 32d9fd4..acc5bd2 100644
return false;
}
}
@@ -362,7 +376,7 @@ public final class ItemStack {
@@ -363,7 +377,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.e()) {

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

@ -1,14 +1,14 @@
From b479a3f64dc5ddc7b1bed9a442747649f98c97cb Mon Sep 17 00:00:00 2001
From fb58dd6254e350724b17e19abd41c951c684fb41 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 7985cb2..2dbe78a 100644
index d754d0d..28c3a72 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -657,11 +657,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -662,11 +662,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.h[this.ticks % 100] = System.nanoTime() - i;
this.methodProfiler.b();
this.methodProfiler.a("snooper");

8
CraftBukkit-Patches/0044-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 888da7cb034e6c7a729d720b21e122b9932fea27 Mon Sep 17 00:00:00 2001
From 4301af27dac931f8831bf87c1c285c0b7237a5d3 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.
@ -18,10 +18,10 @@ index 1361b06..e5c0ed9 100644
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 2dbe78a..4d86a4b 100644
index 28c3a72..bc9ac2b 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
@@ -568,6 +568,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.a(crashreport);
} finally {
try {
@ -29,7 +29,7 @@ index 2dbe78a..4d86a4b 100644
this.isStopped = true;
this.stop();
} catch (Throwable throwable1) {
@@ -667,6 +668,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -672,6 +673,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.b();
this.methodProfiler.b();

6
CraftBukkit-Patches/0050-Configurable-Amount-of-Netty-Threads.patch
View file

@ -1,4 +1,4 @@
From 3966c642ae368fedf29af097481312ea9e6e2d8b Mon Sep 17 00:00:00 2001
From edc862d79d59ff2cc77a068e722a11c3bfcd9abe 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 4d86a4b..96d1362 100644
index bc9ac2b..d616c4f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -57,7 +57,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -27,7 +27,7 @@ index 4d86a4b..96d1362 100644
this.b = this.i();
// this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
this.dataConverterManager = dataconvertermanager;
@@ -1298,7 +1298,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1303,7 +1303,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
// Spigot End
public ServerConnection am() {

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

@ -1,14 +1,14 @@
From f39cb0bae58065bf899255384f87cfbe6a512f7a Mon Sep 17 00:00:00 2001
From 9aa16093b9bdf922f4ac04d87c5eaeb9e5fa377a 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 96d1362..c82c67b 100644
index d616c4f..05a63cb 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
@@ -549,6 +549,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
} catch (Throwable throwable) {
MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);

6
CraftBukkit-Patches/0060-Fix-ItemStack-Unbreakable-Code.patch
View file

@ -1,14 +1,14 @@
From 825919ad07bcfd42acb7ecb702bf6b81ab3ed65c Mon Sep 17 00:00:00 2001
From a17c3d5a74dff88474c03a2acac242993d27a5e2 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
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index acc5bd2..3d02391 100644
index 1f41f6d..e11dbef 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -283,7 +283,13 @@ public final class ItemStack {
@@ -284,7 +284,13 @@ public final class ItemStack {
}
public boolean e() {

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

@ -1,14 +1,14 @@
From 5229014af5bb815790e2345c4fdbde5d867c3ef2 Mon Sep 17 00:00:00 2001
From 91ccf3dfcb0fe90e0fdd2392b0f6951f8bee8f1a 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 c82c67b..70dbd88 100644
index 05a63cb..dfe3305 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -743,7 +743,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -748,7 +748,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
worldserver.doTick();
worldserver.timings.doTick.stopTiming(); // Spigot
} catch (Throwable throwable) {
@ -22,7 +22,7 @@ index c82c67b..70dbd88 100644
worldserver.a(crashreport);
throw new ReportedException(crashreport);
}
@@ -753,7 +759,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -758,7 +764,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
worldserver.tickEntities();
worldserver.timings.tickEntities.stopTiming(); // Spigot
} catch (Throwable throwable1) {

6
CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From 4f5473f7769a1c5f7f51252a4817522a1a8ed1d7 Mon Sep 17 00:00:00 2001
From 4af1d6f24291acf1ec980e735d957b24a6d4c978 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
@ -37,10 +37,10 @@ index 8f3cd56..fd3f457 100644
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 70dbd88..a16a2d2 100644
index dfe3305..bd2837c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -655,7 +655,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -660,7 +660,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
SpigotTimings.worldSaveTimer.startTiming(); // Spigot
this.methodProfiler.a("save");
this.v.savePlayers();

8
CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch
View file

@ -1,11 +1,11 @@
From ad0645db8fc6714568aa8ac47dd5618e3ad62132 Mon Sep 17 00:00:00 2001
From 8ae40e4b57d9b0750319f013dbe1d818b9bc43be 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 a16a2d2..67f2de5 100644
index bd2837c..49e5aac 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -114,6 +114,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -21,7 +21,7 @@ index a16a2d2..67f2de5 100644
public MinecraftServer(OptionSet options, Proxy proxy, DataConverterManager dataconvertermanager, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
this.e = proxy;
@@ -497,6 +503,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -502,6 +508,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.isRunning = false;
}
@ -35,7 +35,7 @@ index a16a2d2..67f2de5 100644
public void run() {
try {
if (this.init()) {
@@ -507,38 +520,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -512,38 +525,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.q.setServerInfo(new ServerPing.ServerData("1.9", 107));
this.a(this.q);

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

@ -1,4 +1,4 @@
From 4f85914f6e72b5e14741e5b84a81c8e3d2b98ea4 Mon Sep 17 00:00:00 2001
From 18dd2fd41de7ddd765a1790af7cc55f8e34c3f4d 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 67f2de5..4753c18 100644
index 49e5aac..f550dff 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1008,7 +1008,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1013,7 +1013,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
}
public String getServerModName() {

6
CraftBukkit-Patches/0108-Configurable-save-on-stop-only-for-UserCache.patch
View file

@ -1,14 +1,14 @@
From 737b533613dba19eb9b98f1db8a40b77c33c3676 Mon Sep 17 00:00:00 2001
From 4bfb89700e3794a7600e65a190bca8e636efbfc4 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 23 May 2014 18:05:10 -0400
Subject: [PATCH] Configurable save-on-stop-only for UserCache
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4753c18..bf0b825 100644
index f550dff..e96a01f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -485,6 +485,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -490,6 +490,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.m.e();
}

6
CraftBukkit-Patches/0142-Use-FastMatches-for-ItemStack-Dirty-Check.patch
View file

@ -1,4 +1,4 @@
From ee9c226272ebcee35cfbd070c0e354f0cd5e6574 Mon Sep 17 00:00:00 2001
From 73f97633e63c73fac4b4bb32d4c7bfa3535afa9e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 22 Feb 2015 12:27:40 +1100
Subject: [PATCH] Use FastMatches for ItemStack Dirty Check
@ -35,10 +35,10 @@ index 1d6ec51..000b4db 100644
}
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 3d02391..a649192 100644
index e11dbef..4a2e0df 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -448,6 +448,18 @@ public final class ItemStack {
@@ -449,6 +449,18 @@ public final class ItemStack {
return itemstack == null && itemstack1 == null ? true : (itemstack != null && itemstack1 != null ? (itemstack.tag == null && itemstack1.tag != null ? false : itemstack.tag == null || itemstack.tag.equals(itemstack1.tag)) : false);
}

8
CraftBukkit-Patches/0143-Use-CLQ-for-main-thread-tasks.patch
View file

@ -1,11 +1,11 @@
From 0eeaa450168028e4e727629c01492611aa91095a Mon Sep 17 00:00:00 2001
From 07b0592001e94be3e44f3df2f45214be3a861bb5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 19 Apr 2015 09:19:39 +1000
Subject: [PATCH] Use CLQ for main thread tasks.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 32290a0..89e6ad3 100644
index 866148d..4cc436d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -98,7 +98,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -17,7 +17,7 @@ index 32290a0..89e6ad3 100644
private Thread serverThread;
private long aa = av();
@@ -709,11 +709,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -714,11 +714,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.methodProfiler.a("jobs");
Queue queue = this.j;
@ -36,7 +36,7 @@ index 32290a0..89e6ad3 100644
this.methodProfiler.c("levels");
@@ -1476,10 +1478,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1481,10 +1483,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callable);
Queue queue = this.j;