revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh md_5 By: Hudson <hudson@mydomain.com>
This commit is contained in:
@@ -1,19 +1,17 @@
|
||||
From e23a9931b30736363eca493eee4d6ea14dc7c0d5 Mon Sep 17 00:00:00 2001
|
||||
From 62fd1a277c1bb1539fa0321896b9f109cc7e2887 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Primm <mike@primmhome.com>
|
||||
Date: Sun, 23 Dec 2012 14:46:23 -0600
|
||||
Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
|
||||
buffers when non-trivial value Saving from 40-45% of memory use by chunk
|
||||
section data.
|
||||
Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate buffers when non-trivial value Saving from 40-45% of memory use by chunk section data.
|
||||
|
||||
Finish up NibbleArray lightening work - use for Snapshots, reduce copies
|
||||
|
||||
Fix nibble handling with NBT - arrays aren't copied by NBTByteArray
|
||||
---
|
||||
.../net/minecraft/server/ChunkRegionLoader.java | 10 +-
|
||||
.../java/net/minecraft/server/ChunkSection.java | 24 ++--
|
||||
.../java/net/minecraft/server/NibbleArray.java | 122 ++++++++++++++++++++-
|
||||
.../net/minecraft/server/Packet51MapChunk.java | 28 +++--
|
||||
.../java/org/bukkit/craftbukkit/CraftChunk.java | 44 +++++++-
|
||||
.../net/minecraft/server/ChunkRegionLoader.java | 10 +-
|
||||
.../java/net/minecraft/server/ChunkSection.java | 24 +++--
|
||||
.../java/net/minecraft/server/NibbleArray.java | 122 +++++++++++++++++++-
|
||||
.../net/minecraft/server/Packet51MapChunk.java | 28 +++--
|
||||
.../java/org/bukkit/craftbukkit/CraftChunk.java | 44 ++++++-
|
||||
5 files changed, 197 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -313,7 +311,7 @@ index 14a6245..ee179be 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
index 79c3893..97b7b5b 100644
|
||||
index 79c3893..ad58bef 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
@@ -174,7 +174,18 @@ public class CraftChunk implements Chunk {
|
||||
@@ -385,5 +383,5 @@ index 79c3893..97b7b5b 100644
|
||||
}
|
||||
|
||||
--
|
||||
1.8.1-rc2
|
||||
1.7.0.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user