xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Introduced World Save Thread and some refractoring

Browse Source
This commit is contained in:
Prototik
2015-10-14 20:31:35 +07:00
parent a5b10b36ab
commit 98f4f02f55
22 changed files with 424 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -263,6 +263,7 @@ public final class CraftServer implements Server {
waterAnimalSpawn = configuration.getInt("spawn-limits.water-animals");
ambientSpawn = configuration.getInt("spawn-limits.ambient");
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
console.invalidateWorldSaver();
warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
loadIcon();
chunkGCEnabled = configuration.getBoolean("chunk-gc.enabled"); // Cauldron
@@ -764,6 +765,7 @@ public final class CraftServer implements Server {
warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
printSaveWarning = false;
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
console.invalidateWorldSaver();
chunkGCPeriod = configuration.getInt("chunk-gc.period-in-ticks");
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
loadIcon();
@@ -1307,7 +1309,7 @@ public final class CraftServer implements Server {
// Spigot start
GameProfile profile = null;
if (MinecraftServer.getServer().isServerInOnlineMode() || org.spigotmc.SpigotConfig.bungee) {
profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(name);
profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(name);
}
if (profile == null) {
// Make an OfflinePlayer using an offline mode UUID since the name has no profile

34
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -88,7 +88,7 @@ public class CraftWorld implements World {
}
public Block getBlockAt(int x, int y, int z) {
Chunk chunk = getChunkAt(x >> 4, z >> 4);
Chunk chunk = getChunkAt(x >> 4, z >> 4);
return chunk == null ? null : chunk.getBlock(x & 0xF, y & 0xFF, z & 0xF);
}
@@ -125,7 +125,7 @@ public class CraftWorld implements World {
}
public Chunk getChunkAt(int x, int z) {
net.minecraft.world.chunk.Chunk chunk = this.world.theChunkProviderServer.loadChunk(x, z);
net.minecraft.world.chunk.Chunk chunk = this.world.theChunkProviderServer.loadChunk(x, z);
return chunk == null ? null : chunk.bukkitChunk;
}
@@ -1395,23 +1395,23 @@ public class CraftWorld implements World {
final net.minecraft.world.gen.ChunkProviderServer cps = world.theChunkProviderServer;
cps.loadedChunkHashMap_KC.forEachValue(new TObjectProcedure<net.minecraft.world.chunk.Chunk>() {
@Override
public boolean execute(net.minecraft.world.chunk.Chunk chunk) {
// If in use, skip it
if (isChunkInUse(chunk.xPosition, chunk.zPosition)) {
return true;
}
@Override
public boolean execute(net.minecraft.world.chunk.Chunk chunk) {
// If in use, skip it
if (isChunkInUse(chunk.xPosition, chunk.zPosition)) {
return true;
}
// Already unloading?
if (cps.chunksToUnload.contains(chunk.xPosition, chunk.zPosition)) {
return true;
}
// Already unloading?
if (cps.chunksToUnload.contains(chunk.xPosition, chunk.zPosition)) {
return true;
}
// Add unload request
cps.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
return true;
}
});
// Add unload request
cps.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
return true;
}
});
}
// Spigot start

2
src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
View File

@@ -166,7 +166,7 @@ public class CraftSkull extends CraftBlockState implements Skull {
}
public BlockFace getRotation() {
return getBlockFace(rotation);
return getBlockFace(rotation);
}
public void setRotation(BlockFace rotation) {

2
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@@ -416,7 +416,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
net.minecraft.world.WorldServer newWorld = ((CraftWorld) location.getWorld()).getHandle();
if (newWorld != entity.worldObj) {
entity.teleportTo(location, cause.isPortal());
entity.teleportTo(location, cause.isPortal());
return true;
}
// Spigot

4
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@@ -44,7 +44,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
public PlayerInventory getInventory() {
if (inventory == null) inventory = new CraftInventoryPlayer(((net.minecraft.entity.player.EntityPlayer) entity).inventory);
if (inventory == null) inventory = new CraftInventoryPlayer(((net.minecraft.entity.player.EntityPlayer) entity).inventory);
return inventory;
}
@@ -53,7 +53,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
public Inventory getEnderChest() {
if (enderChest == null) enderChest = new CraftInventory(((net.minecraft.entity.player.EntityPlayer) entity).getInventoryEnderChest());
if (enderChest == null) enderChest = new CraftInventory(((net.minecraft.entity.player.EntityPlayer) entity).getInventoryEnderChest());
return enderChest;
}

4
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -82,8 +82,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
firstPlayed = System.currentTimeMillis();
double maxHealth = entity.getEntityAttribute(SharedMonsterAttributes.maxHealth).getBaseValue();
if (maxHealth != health) {
healthScale = maxHealth;
scaledHealth = true;
healthScale = maxHealth;
scaledHealth = true;
}
}

6
src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

@@ -80,9 +80,9 @@ public final class CraftChatMessage {
currentChatComponent = null;
break;
case 3:
if (match.indexOf("://") < 0) {
match = "http://" + match;
}
if (match.indexOf("://") < 0) {
match = "http://" + match;
}
modifier.setChatClickEvent(new net.minecraft.event.ClickEvent(net.minecraft.event.ClickEvent.Action.OPEN_URL, match)); // Should be setChatClickable
appendNewComponent(matcher.end(groupId));
modifier.setChatClickEvent((net.minecraft.event.ClickEvent) null);

98
src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java
View File

@@ -188,7 +188,7 @@ public class LongHashSet implements Set<Long> {
}
}
@Override
@Override
public void clear() {
elements = 0;
for (int ix = 0; ix < values.length; ix++) {
@@ -214,9 +214,9 @@ public class LongHashSet implements Set<Long> {
return result;
}
@Override
@Override
public Long[] toArray() {
Long[] result = new Long[elements];
Long[] result = new Long[elements];
long[] values = Java15Compat.Arrays_copyOf(this.values, this.values.length);
int pos = 0;
@@ -229,10 +229,10 @@ public class LongHashSet implements Set<Long> {
return result;
}
@Override
public <T> T[] toArray(T[] arg0) {
throw new UnsupportedOperationException();
}
@Override
public <T> T[] toArray(T[] arg0) {
throw new UnsupportedOperationException();
}
public long popFirst() {
for (long value : values) {
@@ -359,52 +359,52 @@ public class LongHashSet implements Set<Long> {
}
}
@Override
public boolean add(Long value) {
return add(value.longValue());
}
@Override
public boolean add(Long value) {
return add(value.longValue());
}
@Override
public boolean addAll(Collection<? extends Long> collection) {
boolean result = false;
for (Long value : collection) result |= add(value.longValue());
return result;
}
@Override
public boolean addAll(Collection<? extends Long> collection) {
boolean result = false;
for (Long value : collection) result |= add(value.longValue());
return result;
}
@Override
public boolean contains(Object o) {
return o instanceof Long ? contains(((Long) o).longValue()) : false;
}
@Override
public boolean contains(Object o) {
return o instanceof Long ? contains(((Long) o).longValue()) : false;
}
@Override
public boolean containsAll(Collection<?> collection) {
for (Object value : collection) if (!contains(value)) return false;
return true;
}
@Override
public boolean containsAll(Collection<?> collection) {
for (Object value : collection) if (!contains(value)) return false;
return true;
}
@Override
public boolean remove(Object o) {
return o instanceof Long ? remove(((Long) o).longValue()) : false;
}
@Override
public boolean remove(Object o) {
return o instanceof Long ? remove(((Long) o).longValue()) : false;
}
@Override
public boolean removeAll(Collection<?> collection) {
boolean result = false;
for (Object value : collection) result |= remove(value);
return result;
}
@Override
public boolean removeAll(Collection<?> collection) {
boolean result = false;
for (Object value : collection) result |= remove(value);
return result;
}
@Override
public boolean retainAll(Collection<?> collection) {
boolean result = false;
Iterator<Long> iterator = iterator();
while(iterator.hasNext()) {
Long l = iterator.next();
if (!collection.contains(l)) {
iterator.remove();
result = true;
}
}
return result;
}
@Override
public boolean retainAll(Collection<?> collection) {
boolean result = false;
Iterator<Long> iterator = iterator();
while(iterator.hasNext()) {
Long l = iterator.next();
if (!collection.contains(l)) {
iterator.remove();
result = true;
}
}
return result;
}
}

58
src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java
View File

@@ -207,7 +207,7 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
* @return Set of Entry objects
*/
public Set<Map.Entry<Long, V>> entrySet() {
return new EntrySet();
return new EntrySet();
}
public Object clone() throws CloneNotSupportedException {
@@ -425,40 +425,40 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
}
private void bind(long key, V value) {
this.key = key;
this.value = value;
this.key = key;
this.value = value;
}
}
private class EntrySet extends AbstractSet<Map.Entry<Long, V>> {
@Override
public Iterator<Map.Entry<Long, V>> iterator() {
return new Iterator<Map.Entry<Long, V>>() {
final Entry entry = new Entry();
final ValueIterator valueIterator = new ValueIterator();
@Override
public boolean hasNext() {
return valueIterator.hasNext();
}
@Override
public Iterator<Map.Entry<Long, V>> iterator() {
return new Iterator<Map.Entry<Long, V>>() {
final Entry entry = new Entry();
final ValueIterator valueIterator = new ValueIterator();
@Override
public boolean hasNext() {
return valueIterator.hasNext();
}
@Override
public LongObjectHashMap<V>.Entry next() {
V value = valueIterator.next();
entry.bind(valueIterator.prevKey, value);
return entry;
}
@Override
public LongObjectHashMap<V>.Entry next() {
V value = valueIterator.next();
entry.bind(valueIterator.prevKey, value);
return entry;
}
@Override
public void remove() {
valueIterator.remove();
}
};
}
@Override
public void remove() {
valueIterator.remove();
}
};
}
@Override
public int size() {
return LongObjectHashMap.this.size;
}
@Override
public int size() {
return LongObjectHashMap.this.size;
}
}
}

10
src/main/java/org/spigotmc/RestartCommand.java
View File

@@ -28,7 +28,7 @@ public class RestartCommand extends Command
}
public static void restart() {
restart(false);
restart(false);
}
public static void restart(boolean forbidShutdown)
@@ -102,10 +102,10 @@ public class RestartCommand extends Command
Runtime.getRuntime().addShutdownHook( shutdownHook );
} else
{
if (forbidShutdown) {
System.out.println("Attempt to restart server without restart script, decline request");
return;
}
if (forbidShutdown) {
System.out.println("Attempt to restart server without restart script, decline request");
return;
}
System.out.println( "Startup script '" + SpigotConfig.restartScript + "' does not exist! Stopping server." );
}
cpw.mods.fml.common.FMLCommonHandler.instance().exitJava(0, false);

2
src/main/java/org/spigotmc/SpigotConfig.java
View File

@@ -271,6 +271,6 @@ public class SpigotConfig
public static int fullMatchRate;
private static void fullMatchRate()
{
fullMatchRate = getInt( "settings.fullMatchRate", 10);
fullMatchRate = getInt( "settings.fullMatchRate", 10);
}
}

6
src/main/java/org/spigotmc/SpigotWorldConfig.java
View File

@@ -283,8 +283,8 @@ public class SpigotWorldConfig
public int entityMaxTickTime;
private void maxTickTimes()
{
tileMaxTickTime = getInt("max-tick-time.tile", 50);
entityMaxTickTime = getInt("max-tick-time.entity", 50);
log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms");
tileMaxTickTime = getInt("max-tick-time.tile", 50);
entityMaxTickTime = getInt("max-tick-time.entity", 50);
log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms");
}
}

42
src/main/java/org/spigotmc/TickLimiter.java
View File

@@ -1,25 +1,25 @@
package org.spigotmc;
public class TickLimiter {
private final int maxTime;
private long startTime;
private int tick;
private boolean shouldContinue;
public TickLimiter(int maxTime) {
this.maxTime = maxTime;
}
public void initTick() {
startTime = System.currentTimeMillis();
tick = 0;
shouldContinue = true;
}
public boolean shouldContinue() {
if (++tick >= 300 && shouldContinue) {
tick = 0;
shouldContinue = System.currentTimeMillis() - startTime < maxTime;
}
return shouldContinue;
}
private final int maxTime;
private long startTime;
private int tick;
private boolean shouldContinue;
public TickLimiter(int maxTime) {
this.maxTime = maxTime;
}
public void initTick() {
startTime = System.currentTimeMillis();
tick = 0;
shouldContinue = true;
}
public boolean shouldContinue() {
if (++tick >= 300 && shouldContinue) {
tick = 0;
shouldContinue = System.currentTimeMillis() - startTime < maxTime;
}
return shouldContinue;
}
}