TakeV
/
Paper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re add chunk snc lock and update patch files.

This commit is contained in:
md_5 2013-01-16 11:32:20 +11:00
parent dcde41afb4
commit 9abbfe5f39
17 changed files with 37 additions and 2910 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit-Patches/0001-Spigot-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 3359843a528eeada4d61ef1d4e7c0c30ad4ca982 Mon Sep 17 00:00:00 2001
From 73cb91ccc10f12f2fb506a6800aaccc8e419c8e3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sat, 5 Jan 2013 15:34:12 +1100
Subject: [PATCH] Spigot POM Changes

29
CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch
View File

@ -1,7 +1,7 @@
From 181e716d4433066069208693b6b494d5944cb0b6 Mon Sep 17 00:00:00 2001
From 6b8688ec60bde099d830d49b86211ac90d295af5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 30 Dec 2012 23:56:05 -0600
Subject: [PATCH 01/13] Spigot Changes. This commit has undergone basic testing
Subject: [PATCH 01/15] Spigot Changes. This commit has undergone basic testing
and appears to now be safe for careful production usage. Please report any
bugs to IRC as soon as you encounter them. Long live Spigot!
@ -28,7 +28,7 @@ Subject: [PATCH 01/13] Spigot Changes. This commit has undergone basic testing
src/main/java/net/minecraft/server/PlayerList.java | 10 +-
.../java/net/minecraft/server/SpawnerCreature.java | 23 +-
.../net/minecraft/server/ThreadLoginVerifier.java | 23 +
src/main/java/net/minecraft/server/World.java | 206 ++++++++-
src/main/java/net/minecraft/server/World.java | 202 ++++++++-
.../java/net/minecraft/server/WorldServer.java | 133 ++++--
.../java/org/bukkit/craftbukkit/CraftServer.java | 108 ++++-
.../java/org/bukkit/craftbukkit/CraftWorld.java | 76 +++-
@ -47,7 +47,7 @@ Subject: [PATCH 01/13] Spigot Changes. This commit has undergone basic testing
.../org/bukkit/craftbukkit/util/TimedThread.java | 37 ++
.../bukkit/craftbukkit/util/WatchdogThread.java | 88 ++++
src/main/resources/configurations/bukkit.yml | 55 +++
41 files changed, 1660 insertions(+), 158 deletions(-)
41 files changed, 1658 insertions(+), 156 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/command/RestartCommand.java
create mode 100644 src/main/java/org/bukkit/craftbukkit/command/TicksPerSecondCommand.java
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/ExceptionHandler.java
@ -69,7 +69,7 @@ index a689360..4138573 100644
+
+/dependency-reduced-pom.xml
diff --git a/pom.xml b/pom.xml
index 47e7e52..c923f94 100644
index 6a75d75..f331d53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
@ -716,7 +716,7 @@ index 0686ba0..58d30eb 100644
URL url = new URL("http://session.minecraft.net/game/checkserver.jsp?user=" + URLEncoder.encode(PendingConnection.d(this.pendingConnection), "UTF-8") + "&serverId=" + URLEncoder.encode(s, "UTF-8"));
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e2fd0df..c50b814 100644
index e2fd0df..263cbd3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -64,7 +64,8 @@ public abstract class World implements IBlockAccess {
@ -786,23 +786,6 @@ index e2fd0df..c50b814 100644
if (worldprovider != null) {
this.worldProvider = worldprovider;
} else if (this.worldData != null && this.worldData.j() != 0) {
@@ -276,14 +298,14 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start
public Chunk getChunkAt(int i, int j) {
Chunk result = null;
- synchronized (this.chunkLock) {
+ // Spigot start - remove sync
if (this.lastChunkAccessed == null || this.lastXAccessed != i || this.lastZAccessed != j) {
this.lastChunkAccessed = this.chunkProvider.getOrCreateChunk(i, j);
this.lastXAccessed = i;
this.lastZAccessed = j;
}
result = this.lastChunkAccessed;
- }
+ // Spigot end
return result;
}
// CraftBukkit end
@@ -903,6 +925,47 @@ public abstract class World implements IBlockAccess {
event = CraftEventFactory.callCreatureSpawnEvent((EntityLiving) entity, spawnReason);
} else if (entity instanceof EntityItem) {

2856
CraftBukkit-Patches/0001-Spigot-Changes.patch
View File

File diff suppressed because it is too large Load Diff

6
CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch
View File

@ -1,7 +1,7 @@
From c17687209fb0774502789624c38b5e8879fc737a Mon Sep 17 00:00:00 2001
From 93138ab48fdb33e2b18aab7b2a6e0637477f900b Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Wed, 19 Dec 2012 19:13:17 -0800
Subject: [PATCH 02/13] Update Maven Shade Plugin to version 2.0. Fixes
Subject: [PATCH 02/15] Update Maven Shade Plugin to version 2.0. Fixes
BUKKIT-3213
---
@ -9,7 +9,7 @@ Subject: [PATCH 02/13] Update Maven Shade Plugin to version 2.0. Fixes
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c923f94..b1c566a 100644
index f331d53..4540fe2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,7 +215,7 @@

4
CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
View File

@ -1,7 +1,7 @@
From dabb132cd8dd0b5940ee7f2a1c2ff37c5239e037 Mon Sep 17 00:00:00 2001
From ddbd99b846d93e4a9685095f908af9164ad9bfc4 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 03/13] Address BUKKIT-3286 by firing the inventory close event
Subject: [PATCH 03/15] Address BUKKIT-3286 by firing the inventory close event
when a secondary container is closed due to the player entity being
destroyed. This covers all edge cases such as server stop / player kick /
player quit.

6
CraftBukkit-Patches/0004-Update-item-merge-logic.patch
View File

@ -1,14 +1,14 @@
From f1b9d9c2a5d620dc7aee11722fd329cd34dcb507 Mon Sep 17 00:00:00 2001
From 3fcd0fe549bd3a463f3903910cff8c5b767cdc8f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:51:07 +1100
Subject: [PATCH 04/13] Update item merge logic
Subject: [PATCH 04/15] Update item merge logic
---
src/main/java/net/minecraft/server/World.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c50b814..29ccbef 100644
index 263cbd3..6e9b13d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -927,6 +927,7 @@ public abstract class World implements IBlockAccess {

4
CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
View File

@ -1,7 +1,7 @@
From 1971336996f8ac3eccdbc631a3d271890d97fc83 Mon Sep 17 00:00:00 2001
From 0ae8cabe89ee22f70058b76f1a2820598c30c25a Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 14 Dec 2012 21:51:06 -0600
Subject: [PATCH 05/13] Include NibbleArray from mc-dev for diff visibility
Subject: [PATCH 05/15] Include NibbleArray from mc-dev for diff visibility
---
.../java/net/minecraft/server/NibbleArray.java | 40 ++++++++++++++++++++++

4
CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
View File

@ -1,7 +1,7 @@
From ccb92789b659c2610a7b8f23740197ed784b749a Mon Sep 17 00:00:00 2001
From f1565b3a54d4f0b94a36ff66760478508ce00ee7 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 23 Dec 2012 14:46:23 -0600
Subject: [PATCH 06/13] Implement 'lightening' of NibbleArrays - only allocate
Subject: [PATCH 06/15] Implement 'lightening' of NibbleArrays - only allocate
buffers when non-trivial value Saving from 40-45% of memory use by chunk
section data.

4
CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch
View File

@ -1,7 +1,7 @@
From cb844f20abeb6fc8a6a9f6492307c7b5ed62b765 Mon Sep 17 00:00:00 2001
From 4456a6d332e982dad87fe1bc8d1185fe3f1ac55b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Mon, 7 Jan 2013 09:57:30 +1100
Subject: [PATCH 07/13] Return LOHS to full operation.
Subject: [PATCH 07/15] Return LOHS to full operation.
---
src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java | 4 ++--

4
CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch
View File

@ -1,7 +1,7 @@
From ac06044ae6bcc052df0c71fe3c7fcacef84467bc Mon Sep 17 00:00:00 2001
From 7a538410153ecb475e4b2cc69913b132a42a035d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Thu, 10 Jan 2013 12:33:37 +1100
Subject: [PATCH 08/13] Update timeout time to new default value.
Subject: [PATCH 08/15] Update timeout time to new default value.
---
src/main/java/org/bukkit/craftbukkit/CraftServer.java | 9 ++++++++-

4
CraftBukkit-Patches/0009-Per-world-view-distance.patch
View File

@ -1,7 +1,7 @@
From 3118b5b6884ef2b1e21e87e00e14a984ef738776 Mon Sep 17 00:00:00 2001
From 17203117557c367c378a202bf378d23ff15f685f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sat, 12 Jan 2013 19:57:45 +1100
Subject: [PATCH 09/13] Per world view distance.
Subject: [PATCH 09/15] Per world view distance.
---
src/main/java/net/minecraft/server/WorldServer.java | 2 +-

6
CraftBukkit-Patches/0010-Fix-various-crop-growth-modifier-formula-issues.patch
View File

@ -1,7 +1,7 @@
From c496c06761b4bda4b215743b3cd33039aef8d5ac Mon Sep 17 00:00:00 2001
From 31793fc6dc16c7bc26f4c23852d3af93bd62fb56 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Jan 2013 11:08:45 -0500
Subject: [PATCH 10/13] Fix various crop growth modifier formula issues
Subject: [PATCH 10/15] Fix various crop growth modifier formula issues
---
src/main/java/net/minecraft/server/BlockCactus.java | 2 +-
@ -28,7 +28,7 @@ index 1cb89fa..57bedfc 100644
world.setData(i, j, k, 0);
} else {
diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
index 4d3b448..815e050 100644
index 4d3b448..b9d35ff 100644
--- a/src/main/java/net/minecraft/server/BlockCrops.java
+++ b/src/main/java/net/minecraft/server/BlockCrops.java
@@ -30,7 +30,7 @@ public class BlockCrops extends BlockFlower {

4
CraftBukkit-Patches/0011-Fix-mob-spawn-radius-setting-so-that-its-actually-us.patch
View File

@ -1,7 +1,7 @@
From 2600250e5c8ad99a131ef58f3180fc5c288882ed Mon Sep 17 00:00:00 2001
From 2bb588c4a9d3dbc9f92296114a05327837b9582b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Jan 2013 14:54:51 -0500
Subject: [PATCH 11/13] Fix mob-spawn-radius setting so that its actually
Subject: [PATCH 11/15] Fix mob-spawn-radius setting so that its actually
used...
---

4
CraftBukkit-Patches/0012-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
View File

@ -1,7 +1,7 @@
From 7fd81ee8ece682794b2cc214b9be16506514a1e6 Mon Sep 17 00:00:00 2001
From 86541c8411e17c01e499676640272b5d092a4ecd Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:41:38 -0800
Subject: [PATCH 12/13] Add OldChunkLoader from mc-dev for diff visibility
Subject: [PATCH 12/15] Add OldChunkLoader from mc-dev for diff visibility
---
.../java/net/minecraft/server/OldChunkLoader.java | 120 +++++++++++++++++++++

4
CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch
View File

@ -1,7 +1,7 @@
From 6d3d278b13d8909db71e87a24af672d0227a0c4c Mon Sep 17 00:00:00 2001
From 275e28d6d1f9e99a6a11b892e2971a2717c2efea Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:49:07 -0800
Subject: [PATCH 13/13] Fix mcRegion-to-Anvil conversion
Subject: [PATCH 13/15] Fix mcRegion-to-Anvil conversion
---
src/main/java/net/minecraft/server/OldChunkLoader.java | 8 +++++---

4
CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch
View File

@ -1,7 +1,7 @@
From 65bee98f2dc2243a21f93902ddc95b371e5f9baa Mon Sep 17 00:00:00 2001
From 30968c177bc0abd977e69ddf6e11a1716f019609 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Tue, 15 Jan 2013 11:48:54 +1100
Subject: [PATCH 14/14] Update pom with Spigot specific info.
Subject: [PATCH 14/15] Update pom with Spigot specific info.
---
pom.xml | 34 ++++------------------------------

2
CraftBukkit-Patches/0015-Update-versioning-check-to-correctly-resolve-api-ver.patch
View File

@ -1,4 +1,4 @@
From 395e8bb758f3f666e65c3fb04e3c8e4c2f79d92c Mon Sep 17 00:00:00 2001
From 7e1f443bfc611ee5ce828b712e2b2ad4b1c01cc8 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 15/15] Update versioning check to correctly resolve api