SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-03 15:13:39 +11:00
parent 223fa04f6f
commit 739f396eba
17 changed files with 69 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CraftBukkit-Patches/0016-Improved-Timings-System.patch
View File

@@ -1,4 +1,4 @@
From ec7ff8fd9912318adb6bbb213fd478c7cde5f1ed Mon Sep 17 00:00:00 2001
From 8f225ceffcca2c68b7c74e1fbce53a2263257422 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
@@ -64,7 +64,7 @@ index fec07f8..0c1350e 100644
protected String H() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1a9df71..5a07791 100644
index b48df95..57f0280 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
@@ -145,7 +145,7 @@ index 1a9df71..5a07791 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2419ac2..4e41695 100644
index 53e70c4..7a76f16 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -908,6 +908,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -198,18 +198,18 @@ index 811f1a4..3de32fe 100644
private static Map i = new HashMap();
private static Map j = new HashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f7fa2fe..4a9d48b 100644
index 75fed94..33391e8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
// CraftBukkit start
@@ -14,6 +14,7 @@ import java.util.concurrent.Callable;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.util.LongHashSet;
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.craftbukkit.util.UnsafeList;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.craftbukkit.CraftServer;
@@ -131,6 +132,8 @@ public abstract class World implements IBlockAccess {
@@ -132,6 +133,8 @@ public abstract class World implements IBlockAccess {
final Object chunkLock = new Object();
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@@ -218,7 +218,7 @@ index f7fa2fe..4a9d48b 100644
public CraftWorld getWorld() {
return this.world;
}
@@ -210,6 +213,7 @@ public abstract class World implements IBlockAccess {
@@ -211,6 +214,7 @@ public abstract class World implements IBlockAccess {
this.a();
this.getServer().addWorld(this.world); // CraftBukkit
@@ -226,7 +226,7 @@ index f7fa2fe..4a9d48b 100644
}
protected abstract IChunkProvider j();
@@ -1242,6 +1246,7 @@ public abstract class World implements IBlockAccess {
@@ -1243,6 +1247,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
@@ -234,7 +234,7 @@ index f7fa2fe..4a9d48b 100644
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1264,7 +1269,9 @@ public abstract class World implements IBlockAccess {
@@ -1265,7 +1270,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead) {
try {
@@ -244,7 +244,7 @@ index f7fa2fe..4a9d48b 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails = crashreport.a("Entity being ticked");
@@ -1289,7 +1296,9 @@ public abstract class World implements IBlockAccess {
@@ -1290,7 +1297,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@@ -254,7 +254,7 @@ index f7fa2fe..4a9d48b 100644
this.N = true;
Iterator iterator = this.tileEntityList.iterator();
@@ -1304,8 +1313,11 @@ public abstract class World implements IBlockAccess {
@@ -1305,8 +1314,11 @@ public abstract class World implements IBlockAccess {
if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
try {
@@ -266,7 +266,7 @@ index f7fa2fe..4a9d48b 100644
crashreport = CrashReport.a(throwable2, "Ticking block entity");
crashreportsystemdetails = crashreport.a("Block entity being ticked");
tileentity.a(crashreportsystemdetails);
@@ -1325,6 +1337,8 @@ public abstract class World implements IBlockAccess {
@@ -1326,6 +1338,8 @@ public abstract class World implements IBlockAccess {
}
}
@@ -275,7 +275,7 @@ index f7fa2fe..4a9d48b 100644
this.N = false;
if (!this.b.isEmpty()) {
this.tileEntityList.removeAll(this.b);
@@ -1363,6 +1377,7 @@ public abstract class World implements IBlockAccess {
@@ -1364,6 +1378,7 @@ public abstract class World implements IBlockAccess {
this.a.clear();
}
@@ -283,7 +283,7 @@ index f7fa2fe..4a9d48b 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1385,6 +1400,7 @@ public abstract class World implements IBlockAccess {
@@ -1386,6 +1401,7 @@ public abstract class World implements IBlockAccess {
byte b0 = 32;
if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
@@ -291,7 +291,7 @@ index f7fa2fe..4a9d48b 100644
entity.T = entity.locX;
entity.U = entity.locY;
entity.V = entity.locZ;
@@ -1446,6 +1462,7 @@ public abstract class World implements IBlockAccess {
@@ -1447,6 +1463,7 @@ public abstract class World implements IBlockAccess {
entity.passenger = null;
}
}