Fix patches.

This commit is contained in:
md_5 2013-04-10 14:06:41 +10:00
parent 0e9aa34299
commit 9d224f6036
42 changed files with 99 additions and 110 deletions

View file

@ -1,16 +1,65 @@
From 602142733870a1f674deb1e40b4318be9cd36479 Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:41:38 -0800
Subject: [PATCH] Add OldChunkLoader from mc-dev for diff visibility
From 0252b7ffef6ff353b9c4c54d9e53a8b452c2ac47 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 10 Apr 2013 13:52:52 +1000
Subject: [PATCH] mc-dev imports
2 files changed, 160 insertions(+)
---
.../java/net/minecraft/server/NibbleArray.java | 40 +++++++
.../java/net/minecraft/server/OldChunkLoader.java | 120 +++++++++++++++++++++
1 file changed, 120 insertions(+)
2 files changed, 160 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/NibbleArray.java
create mode 100644 src/main/java/net/minecraft/server/OldChunkLoader.java
diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
new file mode 100644
index 0000000..5d75a54
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NibbleArray.java
@@ -0,0 +1,40 @@
+package net.minecraft.server;
+
+public class NibbleArray {
+
+ public final byte[] a;
+ private final int b;
+ private final int c;
+
+ public NibbleArray(int i, int j) {
+ this.a = new byte[i >> 1];
+ this.b = j;
+ this.c = j + 4;
+ }
+
+ public NibbleArray(byte[] abyte, int i) {
+ this.a = abyte;
+ this.b = i;
+ this.c = i + 4;
+ }
+
+ public int a(int i, int j, int k) {
+ int l = j << this.c | k << this.b | i;
+ int i1 = l >> 1;
+ int j1 = l & 1;
+
+ return j1 == 0 ? this.a[i1] & 15 : this.a[i1] >> 4 & 15;
+ }
+
+ public void a(int i, int j, int k, int l) {
+ int i1 = j << this.c | k << this.b | i;
+ int j1 = i1 >> 1;
+ int k1 = i1 & 1;
+
+ if (k1 == 0) {
+ this.a[j1] = (byte) (this.a[j1] & 240 | l & 15);
+ } else {
+ this.a[j1] = (byte) (this.a[j1] & 15 | (l & 15) << 4);
+ }
+ }
+}
diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
new file mode 100644
index 0000000..65b0b70
index 0000000..53c1cb5
--- /dev/null
+++ b/src/main/java/net/minecraft/server/OldChunkLoader.java
@@ -0,0 +1,120 @@
@ -134,7 +183,6 @@ index 0000000..65b0b70
+ }
+ }
+}
\ No newline at end of file
--
1.8.2.1

View file

@ -1,4 +1,4 @@
From 44e3b478f6aeb4b9298b06599679448608345ff0 Mon Sep 17 00:00:00 2001
From 2853b69264cbea6a20328a2220c72ffa517d03c0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 17:57:27 +1100
Subject: [PATCH] Spigot Changes

View file

@ -1,4 +1,4 @@
From 7cdbe04118599b614a616171d51f4dee54ffd0e5 Mon Sep 17 00:00:00 2001
From 5e01bfb87ed1cf7b5277fcc508726a4871ea62ac 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

View file

@ -1,4 +1,4 @@
From 58a5ac2f759380063702db6ea9c2e6d5dac41bd4 Mon Sep 17 00:00:00 2001
From 03b486fc7abc3ecea870b646c13a2a5797ea4796 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:29:43 +1100
Subject: [PATCH] LongHash Tweaks.

View file

@ -1,4 +1,4 @@
From b2dfa37cd8758766e20a5060df024e6eff41ec39 Mon Sep 17 00:00:00 2001
From 7cf90500080ff81fe958afe6a7b612b6bf681532 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +1100
Subject: [PATCH] Async Operation Catching

View file

@ -1,4 +1,4 @@
From 2d00479f5aad1da9809b642a58168103b3766c67 Mon Sep 17 00:00:00 2001
From 52a7e6fa033f6c9337814d23cd5c92a1ce231bf1 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

View file

@ -1,4 +1,4 @@
From c4475a155503a8287d1059127faa05576ca6540b Mon Sep 17 00:00:00 2001
From 88282823288a27cc62a55eebf277c7fc5f249f41 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:09:40 +1100
Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when

View file

@ -1,59 +0,0 @@
From aeb91819bcc99160f5de896ed0094ba0f0dd05d8 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 14 Dec 2012 21:51:06 -0600
Subject: [PATCH] Include NibbleArray from mc-dev for diff visibility
---
.../java/net/minecraft/server/NibbleArray.java | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/NibbleArray.java
diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
new file mode 100644
index 0000000..5d75a54
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NibbleArray.java
@@ -0,0 +1,40 @@
+package net.minecraft.server;
+
+public class NibbleArray {
+
+ public final byte[] a;
+ private final int b;
+ private final int c;
+
+ public NibbleArray(int i, int j) {
+ this.a = new byte[i >> 1];
+ this.b = j;
+ this.c = j + 4;
+ }
+
+ public NibbleArray(byte[] abyte, int i) {
+ this.a = abyte;
+ this.b = i;
+ this.c = i + 4;
+ }
+
+ public int a(int i, int j, int k) {
+ int l = j << this.c | k << this.b | i;
+ int i1 = l >> 1;
+ int j1 = l & 1;
+
+ return j1 == 0 ? this.a[i1] & 15 : this.a[i1] >> 4 & 15;
+ }
+
+ public void a(int i, int j, int k, int l) {
+ int i1 = j << this.c | k << this.b | i;
+ int j1 = i1 >> 1;
+ int k1 = i1 & 1;
+
+ if (k1 == 0) {
+ this.a[j1] = (byte) (this.a[j1] & 240 | l & 15);
+ } else {
+ this.a[j1] = (byte) (this.a[j1] & 15 | (l & 15) << 4);
+ }
+ }
+}
--
1.8.2.1

View file

@ -1,4 +1,4 @@
From c0766b26f9c09da34b9ccdd79d971746376df495 Mon Sep 17 00:00:00 2001
From 049772527f3ab878bb0ac13939184229c3f46e6c Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:49:07 -0800
Subject: [PATCH] Fix mcRegion-to-Anvil conversion
@ -8,7 +8,7 @@ Subject: [PATCH] Fix mcRegion-to-Anvil conversion
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
index 65b0b70..0b3bd0d 100644
index 53c1cb5..9a9e20f 100644
--- a/src/main/java/net/minecraft/server/OldChunkLoader.java
+++ b/src/main/java/net/minecraft/server/OldChunkLoader.java
@@ -94,9 +94,11 @@ public class OldChunkLoader {

View file

@ -1,4 +1,4 @@
From 8f7d3dfeffad6861164302cbaa3cdadce69852fd Mon Sep 17 00:00:00 2001
From 1ec84fa256384b8396ea6ec9ad82b016ab30a155 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Tue, 15 Jan 2013 15:05:02 +1100
Subject: [PATCH] Update versioning check to correctly resolve api version.

View file

@ -1,4 +1,4 @@
From 7aeceff7af9f541d67165c8046dd1291dd205382 Mon Sep 17 00:00:00 2001
From 4466ad548b5ab288d65a39030f9766725a46b3cd Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Fri, 18 Jan 2013 16:20:01 +0500
Subject: [PATCH] Optimize packet used to unload chunks for the client

View file

@ -1,4 +1,4 @@
From 37f83e684584fbd91f6442386ab26e2a54c0a9f3 Mon Sep 17 00:00:00 2001
From 460f7249412d2a51f500ed8e307e2e3596a03759 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 19 Jan 2013 01:11:30 -0500
Subject: [PATCH] Skip entity.move() if we are not moving anywhere.

View file

@ -1,4 +1,4 @@
From ade3d3ab314377309d14ead913ec506ee99abd05 Mon Sep 17 00:00:00 2001
From 2338cb87b1abac89c21f2f9bbcfe19177e92e90c Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 16 Jan 2013 15:27:22 -0600
Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache

View file

@ -1,4 +1,4 @@
From aa816997677b3a1b8d7f2d754f05859c2de92372 Mon Sep 17 00:00:00 2001
From 855c2ff526d476e0b59359e209d673e67fe363cf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:28:17 +1100
Subject: [PATCH] Tick loop optimization - sleep for as long as possible.

View file

@ -1,4 +1,4 @@
From 90d50fe2bd2b0db517e5b30d6e1f0924fb13bb7a Mon Sep 17 00:00:00 2001
From 0769dc792bdf91ab5f41213501df138fdbc0c0e7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System

View file

@ -1,4 +1,4 @@
From a8140d06696c7ec1a53ba9e43ea93ce4c835ad19 Mon Sep 17 00:00:00 2001
From f289fb8aaddc2a4864b4f8e934310cd11caeff69 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 10:58:17 +1100
Subject: [PATCH] Add oreobfuscator for Spigot.
@ -164,7 +164,7 @@ index 91bed16..8af36ca 100644
if (false) { // Never trigger
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d5bd340..2e49f5c 100644
index e7c3a0c..9f2be37 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -163,6 +163,13 @@ public final class CraftServer implements Server {
@ -398,5 +398,5 @@ index 9b85e13..a63dc22 100644
+ - world_the_end
+ blocks: [1, 5, 14, 15, 16, 21, 48, 49, 54, 56, 73, 74, 82, 129, 130]
--
1.7.11.msysgit.0
1.8.2.1

View file

@ -1,4 +1,4 @@
From 16dace4c2615d56f9bf5d7147701ef03782784ce Mon Sep 17 00:00:00 2001
From 3a0a265c91648ce4e8d45db8a762d94f7c42c86f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Jan 2013 19:31:14 -0500
Subject: [PATCH] Reduce number of LivingEntity collision checks.

View file

@ -1,4 +1,4 @@
From 53a0398ca0dffd1b12427235bc489394e1b0c7a1 Mon Sep 17 00:00:00 2001
From fd62940cec88d33e07b78585f2c5deb264758669 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 29 Jan 2013 13:25:53 -0500
Subject: [PATCH] Only count entities in chunks being processed for the spawn

View file

@ -1,4 +1,4 @@
From 52005cd2ae3ed48a244cca27a962460445927c3a Mon Sep 17 00:00:00 2001
From beebf944f3e9a21c0e2678e393d3206070d75261 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Detect, remove and warn about null tile entities.

View file

@ -1,4 +1,4 @@
From 7bfa98d5f818738e6adf49abf8bc407cf9b845ce Mon Sep 17 00:00:00 2001
From a3f44a9f8e92d0fea010f437e5c949fda218fac9 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

View file

@ -1,4 +1,4 @@
From 2eccb6337392a0b22ad424e333eb27d9f8e4258f Mon Sep 17 00:00:00 2001
From 78db1b3041b718fe4b343c4f31934713e9d47759 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 20 Feb 2013 23:07:53 -0500
Subject: [PATCH] Optimize getTileEntities performance

View file

@ -1,4 +1,4 @@
From b4cd08b3d500ed538ddffbfc5c6254f20d47f7f5 Mon Sep 17 00:00:00 2001
From 783430598f8aad57eccc92ccd75fc54926cf2e4a Mon Sep 17 00:00:00 2001
From: shakytom <tom.roberts00@gmail.com>
Date: Wed, 20 Feb 2013 22:34:38 -0500
Subject: [PATCH] Improved tile entity lookup for chunk sending

View file

@ -1,4 +1,4 @@
From 46ec0fb4245d8d49bf692585f2e7acc17344548e Mon Sep 17 00:00:00 2001
From b470bfa02c986436da0d3d91888c3983a0ce6523 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the

View file

@ -1,4 +1,4 @@
From ed80e4532dcea20ec8dbe4bd8773f768c9532a7e Mon Sep 17 00:00:00 2001
From 4372dc651d7320403d3080cc3b381122b14ccf68 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.

View file

@ -1,4 +1,4 @@
From 53c8a1e1b7aa88229c34a7bf248dce34abf28579 Mon Sep 17 00:00:00 2001
From e39b946281f9075dbc5fbca03699a88069717b68 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 14 Feb 2013 17:32:20 +1100
Subject: [PATCH] Netty

View file

@ -1,4 +1,4 @@
From afdb25739da5d3df806d709e4628736fac6a519a Mon Sep 17 00:00:00 2001
From 3ac9bc9e8f157872fff48338807a29ae2a2093e3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved ping sending

View file

@ -1,4 +1,4 @@
From 0a55f29b08d6720b563cec891f68714e943839d4 Mon Sep 17 00:00:00 2001
From a9fdf1fb10b2929099a0801a16b7e2afdd084077 Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Fri, 22 Feb 2013 09:23:51 -0700
Subject: [PATCH] Return bed location itself instead of next to bed; Fixes

View file

@ -1,4 +1,4 @@
From f35ee6c9101a78d09ec18b6cd5f122d613354776 Mon Sep 17 00:00:00 2001
From df26ba7e91b1fb951e4649f579812acf537b225d Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Tue, 12 Feb 2013 16:17:31 -0700
Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes

View file

@ -1,4 +1,4 @@
From c99e4572ef7c0e1e2aba94f4446e8c7e3778b113 Mon Sep 17 00:00:00 2001
From 0e94cb04fd0f2a6c99cf935a76238ea755bc42a1 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Sat, 2 Mar 2013 09:36:52 +1100
Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when

View file

@ -1,4 +1,4 @@
From 11d2989ca3bad19e2fd8989c7c5f4d6845ceae99 Mon Sep 17 00:00:00 2001
From a8a242d91159293255e7554f55c4a8dd038915f4 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Mon, 25 Feb 2013 22:26:36 +0200
Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally

View file

@ -1,4 +1,4 @@
From 7e3bf20b26af96ca522dff934750dddaccb3334a Mon Sep 17 00:00:00 2001
From eddd098c9ca459d6be96a9ba9f419973947c9483 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Tue, 26 Feb 2013 20:14:34 +0200
Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when

View file

@ -1,4 +1,4 @@
From 622c39c692e56421f98113564f517d44a8ecdb63 Mon Sep 17 00:00:00 2001
From 2989643c7c29bdd67a68d0285c7a7269dcef703d 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

View file

@ -1,4 +1,4 @@
From ab9322e5ec2898b4039451af370078343072b1c6 Mon Sep 17 00:00:00 2001
From 8946198a7009f0a3f35c0a4d6c049b83a4b4bf21 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities

View file

@ -1,4 +1,4 @@
From c5482476ab6be812fbf52521e09ce0a199aab63a Mon Sep 17 00:00:00 2001
From 94e7104419f58583786b4b0d894fa642c05f68f3 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

View file

@ -1,4 +1,4 @@
From 4273e8e22cd80e2b30dd56579ba9e3e210eda449 Mon Sep 17 00:00:00 2001
From 2b04a672e68b9f131c384964788e80b4d5344b17 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 21 Mar 2013 17:00:54 +1100
Subject: [PATCH] Stage DataWatcher & WatchableObject.

View file

@ -1,4 +1,4 @@
From d06dd0edec0615add8d3ab9497970c32b79e9391 Mon Sep 17 00:00:00 2001
From 9c8bc24c6b42dfee69e63cc54936e014ab0811a5 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

View file

@ -1,4 +1,4 @@
From 7b3cbd9f58a64e4f2f3e3138660c35ae16e06113 Mon Sep 17 00:00:00 2001
From bcbd1c101a4551ad61f50a7251c9720976558389 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support

View file

@ -1,4 +1,4 @@
From 7c7fc1b2b48f008dd2ad6f2bc0ba304a9cf10503 Mon Sep 17 00:00:00 2001
From 3b6a61f47c2b784c95ddfd425b9e316501b197f2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:04:45 +1100
Subject: [PATCH] Texture Pack Resolutions

View file

@ -1,4 +1,4 @@
From 2dc83cca06e50e828e836669e711c67fa4f09716 Mon Sep 17 00:00:00 2001
From 2667f7b024551bd022ac65e8aa51c54987d82a37 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:31:23 +1100
Subject: [PATCH] Entity Tracking Intervals

View file

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

View file

@ -1,4 +1,4 @@
From 5ba72ebebf67d85199b5238967da9f785eaca07b Mon Sep 17 00:00:00 2001
From 50417be2c7a2ff1441f6b9ea0c64cd3434077307 Mon Sep 17 00:00:00 2001
From: Hudson <hudson@mydomain.com>
Date: Wed, 3 Apr 2013 02:16:56 -0500
Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes

View file

@ -1,4 +1,4 @@
From dd262b67dd4a781a72db65f1be65e80c103fa042 Mon Sep 17 00:00:00 2001
From 77faf8b96acde1a57bbb78ee1fed086af6ef2066 Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Fri, 5 Apr 2013 18:13:35 +0100
Subject: [PATCH] Boat dupe fix.
@ -21,5 +21,5 @@ index 8839a45..953e86c 100644
Vehicle vehicle = (Vehicle) this.getBukkitEntity();
VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, null);
--
1.8.2
1.8.2.1