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

Additions to the async operation catching patch.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-23 18:27:02 +11:00
parent 15d914dbf0
commit df6fa740d6
6 changed files with 98 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CraftBukkit-Patches/0017-Improved-Timings-System.patch
View File

@@ -1,4 +1,4 @@
From da35e236d47b4cf1f8abc96b0956e07ff4c97703 Mon Sep 17 00:00:00 2001
From 975bd5c6ca17b8323adefe96e8ac767b63e150c0 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
@@ -279,7 +279,7 @@ index db3fc42..174546d 100644
private static Map b = new HashMap();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7862b43..dd61607 100644
index e79e82a..6cd8a99 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;
@@ -307,7 +307,7 @@ index 7862b43..dd61607 100644
}
protected abstract IChunkProvider j();
@@ -1270,6 +1274,7 @@ public abstract class World implements IBlockAccess {
@@ -1272,6 +1276,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
@@ -315,7 +315,7 @@ index 7862b43..dd61607 100644
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1292,7 +1297,9 @@ public abstract class World implements IBlockAccess {
@@ -1294,7 +1299,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead) {
try {
@@ -325,7 +325,7 @@ index 7862b43..dd61607 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails = crashreport.a("Entity being ticked");
@@ -1317,7 +1324,9 @@ public abstract class World implements IBlockAccess {
@@ -1319,7 +1326,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@@ -335,7 +335,7 @@ index 7862b43..dd61607 100644
this.N = true;
Iterator iterator = this.tileEntityList.iterator();
@@ -1332,8 +1341,11 @@ public abstract class World implements IBlockAccess {
@@ -1334,8 +1343,11 @@ public abstract class World implements IBlockAccess {
if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
try {
@@ -347,7 +347,7 @@ index 7862b43..dd61607 100644
crashreport = CrashReport.a(throwable2, "Ticking tile entity");
crashreportsystemdetails = crashreport.a("Tile entity being ticked");
tileentity.a(crashreportsystemdetails);
@@ -1353,6 +1365,8 @@ public abstract class World implements IBlockAccess {
@@ -1355,6 +1367,8 @@ public abstract class World implements IBlockAccess {
}
}
@@ -356,7 +356,7 @@ index 7862b43..dd61607 100644
this.N = false;
if (!this.b.isEmpty()) {
this.tileEntityList.removeAll(this.b);
@@ -1391,6 +1405,7 @@ public abstract class World implements IBlockAccess {
@@ -1393,6 +1407,7 @@ public abstract class World implements IBlockAccess {
this.a.clear();
}
@@ -364,7 +364,7 @@ index 7862b43..dd61607 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1413,6 +1428,7 @@ public abstract class World implements IBlockAccess {
@@ -1415,6 +1430,7 @@ public abstract class World implements IBlockAccess {
byte b0 = 32;
if (!flag || this.e(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
@@ -372,7 +372,7 @@ index 7862b43..dd61607 100644
entity.U = entity.locX;
entity.V = entity.locY;
entity.W = entity.locZ;
@@ -1474,6 +1490,7 @@ public abstract class World implements IBlockAccess {
@@ -1476,6 +1492,7 @@ public abstract class World implements IBlockAccess {
entity.passenger = null;
}
}