Add obfuscation helper patch to assist update process.

This commit is contained in:
md_5 2014-04-14 10:40:29 +10:00
parent e11d481452
commit 0410a40c1f
132 changed files with 205 additions and 179 deletions

View File

@ -0,0 +1,26 @@
From 58337f50edfe719fbf71c940574371d23afc97d0 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
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 00bb455..dda2602 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1225,6 +1225,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
}
+ // Spigot Start
+ public ServerConnection getServerConnection()
+ {
+ return this.p;
+ }
+ // Spigot End
public ServerConnection ai() {
return this.p;
}
--
1.8.3.2

View File

@ -1,4 +1,4 @@
From 3f08230723b80338c17bb46ad0eaaa2b4ef184a4 Mon Sep 17 00:00:00 2001 From b9a0cde3f43f2d85373c3a494dfb9c7bf9a4f9c8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000 Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration Subject: [PATCH] Spigot Configuration
@ -54,7 +54,7 @@ index 0f97f78..13c0500 100644
this.world = new CraftWorld((WorldServer) this, gen, env); this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index adeab3f..3a72f25 100644 index 5f4bd23..ebaeb98 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -309,8 +309,10 @@ public final class CraftServer implements Server { @@ -309,8 +309,10 @@ public final class CraftServer implements Server {

View File

@ -1,4 +1,4 @@
From b532ab301efdcaa616bdfb70ab71cf81f838f2e3 Mon Sep 17 00:00:00 2001 From 3b97fb4eaaef41db86499223495c75bdab2536c9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000 Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection Subject: [PATCH] Better Chunk Tick Selection

View File

@ -1,4 +1,4 @@
From 8a5eb17b5a35a0b462a4538921f84c529fc5ae20 Mon Sep 17 00:00:00 2001 From f7f33d6aa57afd53eb82d756077e993895658a15 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:17:20 +1000 Date: Fri, 21 Jun 2013 17:17:20 +1000
Subject: [PATCH] Crop Growth Rates Subject: [PATCH] Crop Growth Rates
@ -175,5 +175,5 @@ index 90a227f..7e79ba5 100644
+ } + }
} }
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 4b8464a3c11cd4f4180df88a50d805e6aad0b7b9 Mon Sep 17 00:00:00 2001 From 0094c2822caafc637fff7309e009c67424aabc2a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:09:45 +1000 Date: Tue, 11 Jun 2013 12:09:45 +1000
Subject: [PATCH] More Efficient Chunk Save Queue Subject: [PATCH] More Efficient Chunk Save Queue

View File

@ -1,4 +1,4 @@
From 3c8d3ae7d02a158f91498a5dd3bcf32283938fb8 Mon Sep 17 00:00:00 2001 From cb54f74739ff0a97474b244cf05a7d59cfc2b0d0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100 Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration Subject: [PATCH] Merge tweaks and configuration

View File

@ -1,4 +1,4 @@
From 3f339b0dcd3c969217de62f35d7f2c3cdf8dd7a2 Mon Sep 17 00:00:00 2001 From 0ed4d284bbdfffc523e2c2c731443a31df66de15 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:13:47 +1000 Date: Fri, 21 Jun 2013 17:13:47 +1000
Subject: [PATCH] LongHash Tweaks Subject: [PATCH] LongHash Tweaks

View File

@ -1,4 +1,4 @@
From 4507c064694b49ed2a2e7594d0efe82e882c5f8d Mon Sep 17 00:00:00 2001 From dbc3fd4cf4f7f6b1b81f6cd416844b93802e1de1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100 Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching Subject: [PATCH] Async Operation Catching
@ -122,7 +122,7 @@ index d9fbd00..bfa8c23 100644
if (generate) { if (generate) {
// Use the default variant of loadChunk when generate == true. // 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c1d3118..8a09d97 100644 index 716cf70..d6bfa0d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From e4c6f8043272f1445be4b11e8fdf061804736330 Mon Sep 17 00:00:00 2001 From f32fdf0a346328efdfa057b39d0e7503dd0d1713 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100 Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance Subject: [PATCH] View Distance

View File

@ -1,4 +1,4 @@
From 11ccd89a600d948d769e7f16fd841d0e7bee04c4 Mon Sep 17 00:00:00 2001 From 5458bbfb3dfe9c40834dd68fe0e9bec527971fad Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com> From: Mike Primm <mike@primmhome.com>
Date: Sun, 13 Jan 2013 03:49:07 -0800 Date: Sun, 13 Jan 2013 03:49:07 -0800
Subject: [PATCH] Compressed Nibble Arrays Subject: [PATCH] Compressed Nibble Arrays

View File

@ -1,4 +1,4 @@
From 20d63175f20fd319c840616a9de5bf917030e184 Mon Sep 17 00:00:00 2001 From e95aac5349ba7dac025251bc1c0c006dbfbfd010 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com> From: Mike Primm <mike@primmhome.com>
Date: Wed, 16 Jan 2013 15:27:22 -0600 Date: Wed, 16 Jan 2013 15:27:22 -0600
Subject: [PATCH] Sync Free Chunk Reference Cache Subject: [PATCH] Sync Free Chunk Reference Cache

View File

@ -1,4 +1,4 @@
From 804169785fae027e5c3fb669fd06ab046b4d0a02 Mon Sep 17 00:00:00 2001 From 4214005ab5b491ac0a9f6e2994cf1f5f89b01099 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System Subject: [PATCH] Improved Timings System
@ -65,7 +65,7 @@ index 9d933cb..491ef6b 100644
protected String G() { protected String G() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 00bb455..ac2aad8 100644 index dda2602..d7b93a3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -37,6 +37,7 @@ import jline.console.ConsoleReader; @@ -37,6 +37,7 @@ import jline.console.ConsoleReader;

View File

@ -1,4 +1,4 @@
From f6c1507a30e34eb031e40ad1d813f57370afc577 Mon Sep 17 00:00:00 2001 From fa7ec75f87672542655a9d1a836d3090700ef8e1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000 Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -151,5 +151,5 @@ index 6cc3a91..46249d7 100644
+ } + }
} }
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From dad597ee08d239117fb2bbd565d097d3b2524b88 Mon Sep 17 00:00:00 2001 From 400a4b262b161b4882e44a9f1833dd1b46ec30fb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100 Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities Subject: [PATCH] Handle Null Tile Entities

View File

@ -1,4 +1,4 @@
From 8170a876eb425d2a6c4010c687bda0f26b509b6e Mon Sep 17 00:00:00 2001 From 6232c33ae23c495c7aebf1e6575a39d2132ff76c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500 Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range Subject: [PATCH] Entity Activation Range

View File

@ -1,4 +1,4 @@
From a0e2332af7b542884f88ddf99de0c70a192cf6f8 Mon Sep 17 00:00:00 2001 From 51a57c20021e2f9da57a803d86ad1ebcafb43096 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100 Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics Subject: [PATCH] Metrics
@ -657,7 +657,7 @@ index 0000000..f1690a2
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 3dfe4ed..9aaa09a 100644 index fd5997d..98fcb47 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java --- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -35,6 +35,7 @@ public class SpigotConfig @@ -35,6 +35,7 @@ public class SpigotConfig

View File

@ -1,4 +1,4 @@
From 2cdc63b515cf2e42955c527486bcf5f781e3e42e Mon Sep 17 00:00:00 2001 From 28f16d33624ed388f82d6d959e6c1371cdb2160a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100 Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent Subject: [PATCH] PlayerItemDamageEvent
@ -50,5 +50,5 @@ index 791467b..cc18816 100644
--this.count; --this.count;
if (entityliving instanceof EntityHuman) { if (entityliving instanceof EntityHuman) {
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 84be7d864739993024f6a017e154ec711057fbda Mon Sep 17 00:00:00 2001 From 0c0bfe8b1127e609cdaf82697bf7ba4a87af5cd3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100 Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities Subject: [PATCH] Faster UUID for entities
@ -19,5 +19,5 @@ index 4bcd57e..621f593 100644
this.world = world; this.world = world;
this.setPosition(0.0D, 0.0D, 0.0D); this.setPosition(0.0D, 0.0D, 0.0D);
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 6486bb114b1a6e1a2eb2449abf34119d8b7c93a0 Mon Sep 17 00:00:00 2001 From 497af5fb267959f215b8ac57de702065a48ae931 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 18 Mar 2013 20:01:44 +1100 Date: Mon, 18 Mar 2013 20:01:44 +1100
Subject: [PATCH] Prevent NPE in CraftSign Subject: [PATCH] Prevent NPE in CraftSign
@ -32,5 +32,5 @@ index 77717d5..1533dd4 100644
sign.update(); sign.update();
} }
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 8d41e5457f9da0d496a143c12e550a9e542a7214 Mon Sep 17 00:00:00 2001 From 64e6d307ac64707605a61489c5d103511e18de64 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500 Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges Subject: [PATCH] Entity Tracking Ranges
@ -12,7 +12,7 @@ This has multiple benefits:
4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames. 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 8f291c2..52a45da 100644 index 70b0181..c0766d6 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java --- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -92,6 +92,7 @@ public class EntityTracker { @@ -92,6 +92,7 @@ public class EntityTracker {

View File

@ -1,4 +1,4 @@
From bceef7be7c61e117d00e935f7ef2c7b62a88cdfa Mon Sep 17 00:00:00 2001 From 1a2892ea46bdb45810e99c2e858a8f335d45be2f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 19:08:41 +1100 Date: Sat, 23 Mar 2013 19:08:41 +1100
Subject: [PATCH] Limit Custom Map Rendering Subject: [PATCH] Limit Custom Map Rendering

View File

@ -1,4 +1,4 @@
From 97aff802848009171de09dfe1743942f7e803ba7 Mon Sep 17 00:00:00 2001 From e9def1247d73b078f8d84f3009b7a2d0ad5d59b7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:50:27 +1000 Date: Tue, 23 Apr 2013 11:50:27 +1000
Subject: [PATCH] Thread Naming and Tweaks Subject: [PATCH] Thread Naming and Tweaks
@ -19,5 +19,5 @@ index 84dcfcc..a30f217 100644
private CraftAsyncDebugger debugTail = debugHead; private CraftAsyncDebugger debugTail = debugHead;
private static final int RECENT_TICKS; private static final int RECENT_TICKS;
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From cf8cf9db76559a65905429d8e266b43786de6872 Mon Sep 17 00:00:00 2001 From bb48d36ef39d168169ba648695404764df103836 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org> From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200 Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files Subject: [PATCH] Close Unloaded Save Files
@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
public static synchronized RegionFile a(File file1, int i, int j) { public static synchronized RegionFile a(File file1, int i, int j) {
File file2 = new File(file1, "region"); File file2 = new File(file1, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3a72f25..7c5db94 100644 index ebaeb98..9abb380 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -81,6 +81,8 @@ import net.minecraft.server.MinecraftServer; @@ -81,6 +81,8 @@ import net.minecraft.server.MinecraftServer;

View File

@ -1,4 +1,4 @@
From 0a1e4d812ab47f41a9b54eb7bf34462c5427d1d1 Mon Sep 17 00:00:00 2001 From 149cdfe128beb0df0d9055d33a40d3b7da5e179c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000 Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option Subject: [PATCH] Remove -o Option
@ -19,5 +19,5 @@ index bb535c2..93968bd 100644
} }
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 0006f13d52fd4580961dcfba2367254d705bbfee Mon Sep 17 00:00:00 2001 From f39835e2ec7023218ad9d8227c02045e1a3015fb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 1 Jun 2013 16:34:38 +1000 Date: Sat, 1 Jun 2013 16:34:38 +1000
Subject: [PATCH] Recipe Deconstruction Subject: [PATCH] Recipe Deconstruction
@ -67,5 +67,5 @@ index 0fab83c..21181fb 100644
+ // Spigot end + // Spigot end
} }
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From a47c3a4fd3cbb34d9f3ab7b0c6ba521430414081 Mon Sep 17 00:00:00 2001 From 0a51dd1733e0a307cf26bafd596a70e981004f79 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000 Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API Subject: [PATCH] Implement Arrow API
@ -27,5 +27,5 @@ index 09e7223..8c8a173 100644
public Arrow.Spigot spigot() public Arrow.Spigot spigot()
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 58db53f2a0fc9262a36597cb24c19926af8b6cd8 Mon Sep 17 00:00:00 2001 From 4c545da88ebd04a32e7cbb0be787afcf2ac083ef Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org> From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700 Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Cooldowns Subject: [PATCH] Hopper Cooldowns
@ -81,5 +81,5 @@ index 6421bf2..827e6f9 100644
+ } + }
} }
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

@ -1,4 +1,4 @@
From 0911b5dd80e900a7c4c8fa7f4a5599ab3ee06592 Mon Sep 17 00:00:00 2001 From 596282d41a999f6c08fa984d44bcf12c2937c213 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000 Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang Subject: [PATCH] Prevent Shutdown Hang

View File

@ -1,4 +1,4 @@
From d1aee95f430bcaeee60611a01c201aba9ad1e303 Mon Sep 17 00:00:00 2001 From 45421c501fe3ac16483fde71a8143794b8e147e2 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com> From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500 Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent. Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -63,7 +63,7 @@ index 06f9b1f..b97ac4b 100644
return entity; return entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 2911d60..c7e238f 100644 index 4cc25f2..e1e8361 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type; @@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type;
@ -98,5 +98,5 @@ index 2911d60..c7e238f 100644
*/ */
public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) { public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {
-- --
1.8.5.2.msysgit.0 1.8.3.2

View File

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

View File

@ -1,4 +1,4 @@
From cf5a9716d8ddb2da8634724201bcc8316d359a93 Mon Sep 17 00:00:00 2001 From 42581137b2b8313804bd958c5166e9add3dff9fe Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000 Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging Subject: [PATCH] Allow Disabling of Command Logging

View File

@ -1,4 +1,4 @@
From bec9ec4cdc1f74c2811c3a53d8ce1c6b845da231 Mon Sep 17 00:00:00 2001 From 6aa66419cb3e934c0e944a3c2cb6180a29963c4f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000 Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete Subject: [PATCH] Allow Disabling of Command TabComplete

View File

@ -1,4 +1,4 @@
From 1788feaf265d532b6ffd95afd64380cc7be7fbeb Mon Sep 17 00:00:00 2001 From 652a3e1612be1d7961f48a10e2fc73358eb07170 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000 Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages Subject: [PATCH] Configurable Messages
@ -45,7 +45,7 @@ index 4977ea1..0208191 100644
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4cb78fd..674acb9 100644 index 2b6b9fb..6e9f95e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -701,11 +701,7 @@ public final class CraftServer implements Server { @@ -701,11 +701,7 @@ public final class CraftServer implements Server {

View File

@ -1,4 +1,4 @@
From b939e07cf00e75eee84fea4f308ba858c86691ea Mon Sep 17 00:00:00 2001 From a90c3b1287735f4a5b27480ef39d28fa1733ccb2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000 Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates Subject: [PATCH] Allow Disabling of Random Lighting Updates

View File

@ -1,4 +1,4 @@
From df5a15e53159fdd78e0d441d0a780e7948597869 Mon Sep 17 00:00:00 2001 From 2051efdcbc0f117371f6d034dfbf36096ef9b4df Mon Sep 17 00:00:00 2001
From: Andre LeBlanc <andre@norcode.com> From: Andre LeBlanc <andre@norcode.com>
Date: Sat, 6 Apr 2013 12:00:31 -0400 Date: Sat, 6 Apr 2013 12:00:31 -0400
Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes

View File

@ -1,4 +1,4 @@
From 331e7dbd06a41d3af1c9d66c885fbd258607dc57 Mon Sep 17 00:00:00 2001 From 051f0b21d9cdee96e11e7db6bb2577ef59bc69a9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000 Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories Subject: [PATCH] Properly Close Inventories

View File

@ -1,4 +1,4 @@
From 0120877b54f169b974c110ce3ea34ca6897da8d8 Mon Sep 17 00:00:00 2001 From b2830d7802cb73473523fea60775ba9dc70bfd4b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000 Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self Subject: [PATCH] Disallow Interaction With Self

View File

@ -1,4 +1,4 @@
From 08c35cccfe2109d16122a5633f94d14217d5e3d6 Mon Sep 17 00:00:00 2001 From a5924094af40aee70d68f5e69922abc147411028 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:07:54 +1000 Date: Tue, 2 Jul 2013 09:07:54 +1000
Subject: [PATCH] Lower Chunk Compression Subject: [PATCH] Lower Chunk Compression

View File

@ -1,4 +1,4 @@
From a4e61e2c3fef0f754763e903a94e331c9c7990b1 Mon Sep 17 00:00:00 2001 From 7057ec11fe46ec66b9d5f35b589a1c762e31a7f6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000 Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events Subject: [PATCH] Entity Mount and Dismount Events

View File

@ -1,4 +1,4 @@
From 6403bc23c4e6b66b0bafaa5703762a695daf23a7 Mon Sep 17 00:00:00 2001 From 34d0001f99b84405fa2ae14bc74507764eaa6c14 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com> From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400 Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins Subject: [PATCH] Prevent Ghost Players Caused by Plugins

View File

@ -1,4 +1,4 @@
From 78f07fc5afe8f2620fcdaf65bfbbdeff0f38d793 Mon Sep 17 00:00:00 2001 From 9d5f0caeda6236c3483e0b8338bc89d43acc48bd Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com> From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 03:32:32 +0500 Date: Tue, 16 Jul 2013 03:32:32 +0500
Subject: [PATCH] Entity ticking chunk caching Subject: [PATCH] Entity ticking chunk caching

View File

@ -1,4 +1,4 @@
From 2a46d3d0f7423526558466e9cb9db6e3a43d0b92 Mon Sep 17 00:00:00 2001 From 9cc0ddfa178ec0b0aa06f17da9708cefbffd318a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:02:59 +1000 Date: Sat, 3 Aug 2013 19:02:59 +1000
Subject: [PATCH] Plug World Unload Memory Leak Subject: [PATCH] Plug World Unload Memory Leak

View File

@ -1,4 +1,4 @@
From 4f191736ede09810d6a941c601d2ebe74c793797 Mon Sep 17 00:00:00 2001 From 4063f09d6a735da6f77eb959f5fac2dfafad657c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000 Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API Subject: [PATCH] Player Collision API
@ -18,7 +18,7 @@ index e2e7b9c..5b50df0 100644
Entity entity = (Entity) list.get(i); Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3758411..90c0e82 100644 index 6c77253..4c3fd8a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity { @@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity {
@ -57,7 +57,7 @@ index 9b80aef..b519903 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) { public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8a09d97..0c1d655 100644 index d6bfa0d..deb4009 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1290,6 +1290,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1290,6 +1290,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,11 +1,11 @@
From 48935cd26211ad88fb22037bab50630219a63577 Mon Sep 17 00:00:00 2001 From b61831e527703aa087de238c808ff76ec67591dd Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com> From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000 Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ac2aad8..16e3596 100644 index d7b93a3..35453be 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -583,11 +583,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -583,11 +583,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

View File

@ -1,4 +1,4 @@
From 3d306ebf3a969328046d70d8ef0e7299ec33a2d2 Mon Sep 17 00:00:00 2001 From 1f9256b71314d22062c5a8724203cd17bfb120e1 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de> From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000 Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability Subject: [PATCH] Add Getter for Entity Invulnerability

View File

@ -1,11 +1,11 @@
From f3cedd8dc2ab7b9e476b4b80c974dd34e094094a Mon Sep 17 00:00:00 2001 From 14c71f7805bbcf37f398eb162f562533fe5952ee Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000 Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0c1d655..e47af0d 100644 index deb4009..9eb8e19 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From 743480f0ba5ff6d024d38cb4b825a6753cf14039 Mon Sep 17 00:00:00 2001 From 8d33ea18c42f4dfcee84dfb398bdabb701cc1078 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 14 Sep 2013 10:16:38 +1000 Date: Sat, 14 Sep 2013 10:16:38 +1000
Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent

View File

@ -1,4 +1,4 @@
From 10449310a86a7232158caf1d0ae880d984d65e51 Mon Sep 17 00:00:00 2001 From a8d499d7d67e9545e96be449ba713181cf683518 Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com> From: BlackHole <black-hole@live.com>
Date: Tue, 16 Jul 2013 22:34:50 +0200 Date: Tue, 16 Jul 2013 22:34:50 +0200
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT

View File

@ -1,4 +1,4 @@
From d8d5fe8e4c5673b64cb5822a6ef16cca8ecdfad0 Mon Sep 17 00:00:00 2001 From e5384725d1e52d3d48985d6398950f1300573b4a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 21 Sep 2013 12:33:09 +1000 Date: Sat, 21 Sep 2013 12:33:09 +1000
Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving

View File

@ -1,4 +1,4 @@
From cd876340b86e6271abadd7e4319fe79ac301d0ac Mon Sep 17 00:00:00 2001 From 2558f8f50bdfe2c9d8fee5ad9629a2af43379712 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000 Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate Subject: [PATCH] Item Despawn Rate

View File

@ -1,4 +1,4 @@
From 5c6e16695c9ffc3378284ca10e0b80598d95cc00 Mon Sep 17 00:00:00 2001 From e84d44cc072262050be162110feb55a1010954e0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100 Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value Subject: [PATCH] Don't Special Case X Move Value

View File

@ -1,11 +1,11 @@
From 82923f38300b6c62d55ba4e61b10a45d2510ef50 Mon Sep 17 00:00:00 2001 From 05861ecb4bd0b4b22a3233c9907e885b22b36a1b Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org> From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200 Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API. 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e47af0d..af2ee8c 100644 index 9eb8e19..5d15396 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1303,6 +1303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1303,6 +1303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From acca141f0ca29a93cbb236c490997fb0338cb15f Mon Sep 17 00:00:00 2001 From d56362c6b3f949b07066d5b75c0d89b7645a7809 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Wed, 9 Oct 2013 18:20:05 +1100 Date: Wed, 9 Oct 2013 18:20:05 +1100
Subject: [PATCH] Fix BrewingStands Removing NBT / Potions Subject: [PATCH] Fix BrewingStands Removing NBT / Potions

View File

@ -1,4 +1,4 @@
From 277c9ec5a89466241ff3af7b171bd6b3db75ec5c Mon Sep 17 00:00:00 2001 From 7f4fc5deeaf1722ba8bb9330f990688f9bf8f607 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100 Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate Subject: [PATCH] Arrow Despawn Rate

View File

@ -1,11 +1,11 @@
From 9cb6e8e5ee6083bf3d3d76cf01d6d56635b16deb Mon Sep 17 00:00:00 2001 From 8e1e8ca5baa8180ccc679d3d72776f3f94061c40 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100 Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread. Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 16e3596..883c3b5 100644 index 35453be..e78d8f3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -498,6 +498,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -498,6 +498,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -26,7 +26,7 @@ index 16e3596..883c3b5 100644
} }
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644 new file mode 100644
index 0000000..917a931 index 0000000..7c086fd
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
@ -83,7 +83,7 @@ index 0000000..917a931
+ { + {
+ } + }
+ // Close the socket so we can rebind with the new process + // Close the socket so we can rebind with the new process
+ MinecraftServer.getServer().ai().b(); + MinecraftServer.getServer().getServerConnection().b();
+ +
+ // Give time for it to kick in + // Give time for it to kick in
+ try + try

View File

@ -1,4 +1,4 @@
From f420cf9bcad51dfc93bcd6fef52d278f0db1a85b Mon Sep 17 00:00:00 2001 From 6c75964a5839dcc79ee1c6a76b5d76b8fd01a265 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 3 Dec 2013 11:07:48 +1100 Date: Tue, 3 Dec 2013 11:07:48 +1100
Subject: [PATCH] Clear Flower Pot on Drop Subject: [PATCH] Clear Flower Pot on Drop

View File

@ -1,4 +1,4 @@
From ea80c509c6b04cf606dc0b2b8d55abcd082fea31 Mon Sep 17 00:00:00 2001 From 5f093f85ed2c1d9da20455743d3ccb08915c4a3c Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 2 Dec 2013 23:42:09 +0000 Date: Mon, 2 Dec 2013 23:42:09 +0000
Subject: [PATCH] Fix some chunks not being sent to the client Subject: [PATCH] Fix some chunks not being sent to the client

View File

@ -1,4 +1,4 @@
From 26d428354a8730f2ddd51c761aa5226c1f8150a3 Mon Sep 17 00:00:00 2001 From 3d991969a4a2a4490524309060e287d6ac1b7fb4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 5 Dec 2013 13:55:53 +1100 Date: Thu, 5 Dec 2013 13:55:53 +1100
Subject: [PATCH] Fix Broken Async Chat Subject: [PATCH] Fix Broken Async Chat

View File

@ -1,11 +1,11 @@
From 939807f8187bbeddaad80e17a6f9b5aff5d37b26 Mon Sep 17 00:00:00 2001 From 63e6a0b006cd2d0e08daaffb2d8227c26d464ead Mon Sep 17 00:00:00 2001
From: ItsHarry <info@itsjerryandharry.com> From: ItsHarry <info@itsjerryandharry.com>
Date: Thu, 5 Dec 2013 21:58:11 +0100 Date: Thu, 5 Dec 2013 21:58:11 +0100
Subject: [PATCH] Allow Teleportation of Vehicles and Passengers Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index af2ee8c..217d5dd 100644 index 5d15396..d7934b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From 7cb3708727460f4851ac82174340ec5cf6cfa2c5 Mon Sep 17 00:00:00 2001 From 302c780a23bf59fb71c3f57b05adafcfafbf5d12 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 8 Dec 2013 16:52:42 +1100 Date: Sun, 8 Dec 2013 16:52:42 +1100
Subject: [PATCH] Remove OS X Special Chars from Signs Subject: [PATCH] Remove OS X Special Chars from Signs

View File

@ -1,4 +1,4 @@
From a0f89c1e4ffcf797b4d4754a4eb1953325f0f365 Mon Sep 17 00:00:00 2001 From c44d5b44a0b2f9a50a266994f0642758bd080c21 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000 Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator Subject: [PATCH] Orebfuscator

View File

@ -1,4 +1,4 @@
From 1ec055e01968b90c4098480749669240324766f8 Mon Sep 17 00:00:00 2001 From fa836fb4ebe6b6827b60b56a600dd714f823dd08 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:45:47 +1100 Date: Fri, 13 Dec 2013 11:45:47 +1100
Subject: [PATCH] Optimize DataWatcher Subject: [PATCH] Optimize DataWatcher

View File

@ -1,4 +1,4 @@
From e144ac992708501a0283d1462490e96d4f3c0b76 Mon Sep 17 00:00:00 2001 From 462c1a850111c2cd6cf0c1882938755fbcd0733b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100 Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode Subject: [PATCH] Fire PreLogin Events in Offline Mode

View File

@ -1,4 +1,4 @@
From 356dff0aa787496546e42947c933cf0b3a316114 Mon Sep 17 00:00:00 2001 From 326665012cc6ce86d73c955b8a61c7880b734c49 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100 Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support Subject: [PATCH] BungeeCord Support
@ -100,7 +100,7 @@ index 9c98a62..d2a378e 100644
if (this.j.isBanned(gameprofile)) { if (this.j.isBanned(gameprofile)) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 217d5dd..7655b65 100644 index d7934b4..cb858a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1299,6 +1299,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1299,6 +1299,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From 9a5885281074f60ef4292ee59dcddc60cef45bba Mon Sep 17 00:00:00 2001 From ae732d661226c243c0f0c6562f87787def4d3a39 Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com> From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600 Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression Subject: [PATCH] Allow Disabling Zombie Villager Aggression

View File

@ -1,4 +1,4 @@
From ad25620d462d5fe70065feced92acd4e7f8ac4d4 Mon Sep 17 00:00:00 2001 From fa5a84e48c0ea5dd2a391bf8c47dfcf0d93d4a1d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100 Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads 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. 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 883c3b5..3053053 100644 index e78d8f3..c3011fd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -54,7 +54,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -54,7 +54,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -27,9 +27,9 @@ index 883c3b5..3053053 100644
this.o = new CommandDispatcher(); this.o = new CommandDispatcher();
// this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init // this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init
this.T = new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString()); this.T = new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString());
@@ -1244,7 +1244,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -1250,7 +1250,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
} }
// Spigot End
public ServerConnection ai() { public ServerConnection ai() {
- return this.p; - return this.p;
+ return ( this.p ) == null ? this.p = new ServerConnection( this ) : this.p; // Spigot + return ( this.p ) == null ? this.p = new ServerConnection( this ) : this.p; // Spigot

View File

@ -1,4 +1,4 @@
From f2e587d7c13c76078d412cb7c61ac9dc8e4660f1 Mon Sep 17 00:00:00 2001 From 0f18693ff71bcfa53e5a046c0bd4617836ebc5ed Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 15:21:02 +1100 Date: Fri, 13 Dec 2013 15:21:02 +1100
Subject: [PATCH] Prevent Mineshaft Saving Subject: [PATCH] Prevent Mineshaft Saving

View File

@ -1,11 +1,11 @@
From 8332b116219b32b6ac8eb349934b5353cc4dac1e Mon Sep 17 00:00:00 2001 From be9a009c45b548f6f8b7a14d0cce4da369cac035 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:39:14 +1100 Date: Wed, 18 Dec 2013 13:39:14 +1100
Subject: [PATCH] Log Cause of Unexpected Exceptions 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3053053..95eb0c0 100644 index c3011fd..66bea38 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -479,6 +479,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -479,6 +479,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

View File

@ -1,4 +1,4 @@
From 376b021ec1cfa26a6fad36a00976ab87f4506ae8 Mon Sep 17 00:00:00 2001 From 5c1e787e2e1b96758e403785b2cacbf5ccd05c6b Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000 Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API Subject: [PATCH] Particle API
@ -117,7 +117,7 @@ index bfa8c23..827ec16 100644
public Spigot spigot() 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7655b65..5726302 100644 index cb858a0..5de0000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1325,6 +1325,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1325,6 +1325,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From 588665caa81c35531fe1d8d487f883dd796c4965 Mon Sep 17 00:00:00 2001 From d982b6075b81dd4c7416b7a26d47c4f034e67f7f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 5 Jan 2014 09:35:01 +1100 Date: Sun, 5 Jan 2014 09:35:01 +1100
Subject: [PATCH] Fix Biome Decoration Crashes Subject: [PATCH] Fix Biome Decoration Crashes

View File

@ -1,4 +1,4 @@
From 98fffaa1f249dc2b18d7f7348141961e7fa51e7d Mon Sep 17 00:00:00 2001 From ecf02f20012ab07610255ca303377134bb36f9f3 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de> From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200 Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag Subject: [PATCH] Save ticks lived to nbttag

View File

@ -1,4 +1,4 @@
From b4e5810cb71e98485b6c6acf2792e42e15c3daf8 Mon Sep 17 00:00:00 2001 From 806a7547a99fbb5c010fbe9fd8cb4b08c10688c1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:17:37 +1000 Date: Tue, 11 Jun 2013 12:17:37 +1000
Subject: [PATCH] More Efficient GetCubes Subject: [PATCH] More Efficient GetCubes

View File

@ -1,4 +1,4 @@
From 8c22f674aff9a23cc32cc20204ffbd3c077565df Mon Sep 17 00:00:00 2001 From abfeaef11caa4887359f27df0a3a9dc631b99ac6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000 Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's Subject: [PATCH] Add Option to Nerf Mobs from Spawner's

View File

@ -1,4 +1,4 @@
From 9fade57b306688afd24a2f9cb671a1ac254618a2 Mon Sep 17 00:00:00 2001 From ef83894b43dcbbe290db12b9f6b6e523ce67cc7e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100 Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient Subject: [PATCH] Warn if PermGen may be insufficient

View File

@ -1,11 +1,11 @@
From 195e2747739ba50bbb38cbb6520136631e992054 Mon Sep 17 00:00:00 2001 From d94e594f5bce82ad3eda6d4771dee9a58e502039 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100 Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5726302..2c129ac 100644 index 5de0000..f8f1a90 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1225,7 +1225,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1225,7 +1225,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From 14989e29d31c4e7f5e58368caa64a150867e2566 Mon Sep 17 00:00:00 2001 From 5c1b57a167f53ec9d75190e48fe075bf40abb3da Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws> From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600 Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option Subject: [PATCH] Add Late Bind Option

View File

@ -1,4 +1,4 @@
From bb4a9f701952be7e06e70fa583f41c8e2dc8382e Mon Sep 17 00:00:00 2001 From eb1838a1a4497940d2b6ea035eebddb7e164ac4b Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com> From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 16:29:51 -0500 Date: Mon, 6 Jan 2014 16:29:51 -0500
Subject: [PATCH] Update Chest Animation when Cancelling Event Subject: [PATCH] Update Chest Animation when Cancelling Event

View File

@ -1,4 +1,4 @@
From 77949ed9e8839d26726aa6faab8a295cd66e88fb Mon Sep 17 00:00:00 2001 From 822aeeaab3d8189633d98e963e05bd7d0a82eead Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com> From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 18:02:01 -0500 Date: Mon, 6 Jan 2014 18:02:01 -0500
Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled

View File

@ -1,11 +1,11 @@
From 3ad41519d19e0a3df1fd7d7f4afc777a6308202a Mon Sep 17 00:00:00 2001 From 1587cd387839a5a012c17ff8c6e3a2fe1d084219 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000 Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced Subject: [PATCH] Allow statistics to be disabled/forced
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
index 0becb94..b868d08 100644 index 819896f..897e88b 100644
--- a/src/main/java/net/minecraft/server/ServerStatisticManager.java --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -32,6 +32,14 @@ public class ServerStatisticManager extends StatisticManager { @@ -32,6 +32,14 @@ public class ServerStatisticManager extends StatisticManager {

View File

@ -1,4 +1,4 @@
From c0b4750afc88f8497a430b94dba3e6a8da431b61 Mon Sep 17 00:00:00 2001 From 3ecc0f61ac0a62c8bb88ee6035b9b2c6fb873a45 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 9 Jan 2014 14:19:12 +0000 Date: Thu, 9 Jan 2014 14:19:12 +0000
Subject: [PATCH] Fix anvil collisions Subject: [PATCH] Fix anvil collisions

View File

@ -1,4 +1,4 @@
From 9eaee04d07cfd72ceacd2f04c43878a73fda0e11 Mon Sep 17 00:00:00 2001 From 710037cf99f0978b5349dcf1c1daf673030406ec Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100 Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code Subject: [PATCH] Fix ItemStack Unbreakable Code

View File

@ -1,11 +1,11 @@
From 947176491e5e4aadd682085aff84a04aadc8cac4 Mon Sep 17 00:00:00 2001 From ea8c941f26554452225f8cde07a42fe8c380db81 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100 Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 95eb0c0..ba9bddd 100644 index 66bea38..c052ff5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -653,7 +653,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -653,7 +653,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

View File

@ -1,4 +1,4 @@
From fe064f684461fc2ab2ac02c4fe2e958ac50f624e Mon Sep 17 00:00:00 2001 From d6e55aba09bb3301d68ae726859c9d2ffd4c04b0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100 Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Replace AutoSave Mechanism Subject: [PATCH] Replace AutoSave Mechanism
@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism
The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant. The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ba9bddd..5e6b2e0 100644 index c052ff5..8738e28 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -582,7 +582,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -582,7 +582,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

View File

@ -1,4 +1,4 @@
From 53172a9b135a389798ac03f2ca0c4a3ac7360196 Mon Sep 17 00:00:00 2001 From b3bc94b822f4e83bd64473abb7e6bdd585e00da7 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 15 Jan 2014 21:52:47 +0000 Date: Wed, 15 Jan 2014 21:52:47 +0000
Subject: [PATCH] Block data values that crash the client Subject: [PATCH] Block data values that crash the client

View File

@ -1,4 +1,4 @@
From 997e88554d0c0405c4356b94a3983d39773e13d3 Mon Sep 17 00:00:00 2001 From 73f6d0da1a6427fb026cf6c1247dafb441cf5ae6 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 14:27:03 +0000 Date: Sat, 18 Jan 2014 14:27:03 +0000
Subject: [PATCH] Support vanilla's direction tag on fireballs Subject: [PATCH] Support vanilla's direction tag on fireballs

View File

@ -1,4 +1,4 @@
From a93c00b173afaded138716b8c9984615ba4c4a39 Mon Sep 17 00:00:00 2001 From aee9dd47382b1bdbe781004dce9da712593a0b0d Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 19:32:42 +0000 Date: Sat, 18 Jan 2014 19:32:42 +0000
Subject: [PATCH] Support non-prefixed URLs Subject: [PATCH] Support non-prefixed URLs

View File

@ -1,4 +1,4 @@
From bbf9a4a1446a2b32c4f0e372ef29b50bbf5bc460 Mon Sep 17 00:00:00 2001 From 1a8a248bbabf2f8d81d31b40d2b0301581306e34 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100 Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.

View File

@ -1,4 +1,4 @@
From 9606ed88d74e97e1b34a8d49f0769144b8dcde01 Mon Sep 17 00:00:00 2001 From 09677540762053e0814db3afd0756b0cb3e9475c Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com> From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000 Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks

View File

@ -1,4 +1,4 @@
From 2d53f0548e60d1c8e6a2ef7dac7e0595389369ad Mon Sep 17 00:00:00 2001 From 56cb3d756f5d2f3471bc0f6a85dd49dd48d92c8b Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 20 Jan 2014 20:42:28 +0000 Date: Mon, 20 Jan 2014 20:42:28 +0000
Subject: [PATCH] Don't let trees replace any block when growing Subject: [PATCH] Don't let trees replace any block when growing

View File

@ -1,11 +1,11 @@
From 09196b2fdf802664cadfe37c650c636ced7ebc6c Mon Sep 17 00:00:00 2001 From 94ecacd1a98659fa044569f98daf4f118ee305b3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sat, 25 Jan 2014 14:08:35 +1100 Date: Sat, 25 Jan 2014 14:08:35 +1100
Subject: [PATCH] Highly Optimized Tick Loop 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5e6b2e0..408b25d 100644 index 8738e28..170e097 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

View File

@ -1,4 +1,4 @@
From 215451881602f5ccd2cbcbf8944d188f87e7b992 Mon Sep 17 00:00:00 2001 From e04e1c93033aa2b9ec322b563ff2327f3c0a7ea0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:35 +1100 Date: Thu, 23 Jan 2014 13:17:35 +1100
Subject: [PATCH] Add Spigot Links Subject: [PATCH] Add Spigot Links

View File

@ -1,4 +1,4 @@
From 417610f025b776ab0799f17c024718fc00348733 Mon Sep 17 00:00:00 2001 From 02573d29f934b6c387e5458c22e7b4516d663b78 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100 Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size Subject: [PATCH] Configurable Ping Sample Size

View File

@ -1,4 +1,4 @@
From 6bc14531206238310ba1247f61fcba97643dd161 Mon Sep 17 00:00:00 2001 From d13124e48d19ef9f4eed821d1d962832032469bc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100 Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling Subject: [PATCH] Add Optional Tick Shuffling

View File

@ -1,4 +1,4 @@
From b23a8af39fa45b1174fa93bd92a1bf61250e4023 Mon Sep 17 00:00:00 2001 From ae57253e0e1dfb4f4ea19fa8b85445993c5f2713 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 28 Jan 2014 20:35:35 +1100 Date: Tue, 28 Jan 2014 20:35:35 +1100
Subject: [PATCH] Allow Configuring Chunks per Packet Subject: [PATCH] Allow Configuring Chunks per Packet

View File

@ -1,4 +1,4 @@
From 5821acb4eb7b20891c07ae0cb701e2860dd6c696 Mon Sep 17 00:00:00 2001 From 5d9faa7e8f6340570872bfa54125c3c8d8efab3b Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net> From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100 Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players Subject: [PATCH] Implement Locale Getter for Players
@ -18,7 +18,7 @@ index 585df73..4fb5f75 100644
public final MinecraftServer server; public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager; 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2c129ac..6f008db 100644 index f8f1a90..354cc07 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1368,6 +1368,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1368,6 +1368,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View File

@ -1,4 +1,4 @@
From 529916ed53368b405e0fec69b993dba3d4562c15 Mon Sep 17 00:00:00 2001 From 9fa021fc53595329dbb06c9bf2430846146bfbad Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500 Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions Subject: [PATCH] Cap Entity Collisions
@ -19,7 +19,7 @@ index 0ec07c2..c049cd8 100644
if (entity.passenger != this && entity.vehicle != this) { if (entity.passenger != this && entity.vehicle != this) {
double d0 = entity.locX - this.locX; double d0 = entity.locX - this.locX;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 90c0e82..33533c7 100644 index 4c3fd8a..f531103 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1491,7 +1491,9 @@ public abstract class EntityLiving extends Entity { @@ -1491,7 +1491,9 @@ public abstract class EntityLiving extends Entity {

View File

@ -1,4 +1,4 @@
From 1e0c6cd80d0e92f6af9ce7d23b3f89f34e0f49d4 Mon Sep 17 00:00:00 2001 From 15fff496d47b970896b595a8987c71c36a43ea16 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 6 Feb 2014 21:59:20 +0000 Date: Thu, 6 Feb 2014 21:59:20 +0000
Subject: [PATCH] Fix dispensing bone meal not having the correct data value Subject: [PATCH] Fix dispensing bone meal not having the correct data value

View File

@ -1,4 +1,4 @@
From 8416d3c33ad72d602ce5a61b4b8a704bb2290ab6 Mon Sep 17 00:00:00 2001 From 2b8500f85b705a5cb5699970cc4a42d4f6fefe88 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000 Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions Subject: [PATCH] Spam Filter Exclusions

View File

@ -1,4 +1,4 @@
From b6dc5546cc63f84dd179b632c18b1df795530175 Mon Sep 17 00:00:00 2001 From b221c8c5c0203cbe6da2d8726e4646fe97a70735 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100 Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console Subject: [PATCH] Add Option to Silence CommandBlock Console

View File

@ -1,11 +1,11 @@
From dcac97e8a999b9ff4bda55a612a260cc9527ea4f Mon Sep 17 00:00:00 2001 From bb55a92d7f8888f22160c9cf382b1225856629b6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500 Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6f008db..779c996 100644 index 354cc07..bdb74b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1374,6 +1374,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1374,6 +1374,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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