From 4600900a0f8c0f63d83d81ea1c61ae07c45fdb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=AA=E8=81=AA?= <178666380@qq.com> Date: Tue, 4 Jul 2017 16:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=8D=95=E8=8E=B7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95,=E9=98=B2=E6=AD=A2=E5=9C=A8=E6=8D=95=E8=8E=B7?= =?UTF-8?q?=E6=9C=9F=E9=97=B4=E5=8F=91=E7=94=9F=E5=BC=82=E5=B8=B8=E9=80=A0?= =?UTF-8?q?=E6=88=90=E6=8D=95=E8=8E=B7=E6=9C=AA=E5=85=B3=E9=97=AD,?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=B8=80=E7=9B=B4=E5=9C=A8=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8D=95=E8=8E=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/MinecraftServer.java.patch | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/patches/net/minecraft/server/MinecraftServer.java.patch b/patches/net/minecraft/server/MinecraftServer.java.patch index dc1e60b..6d03079 100644 --- a/patches/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/net/minecraft/server/MinecraftServer.java.patch @@ -741,13 +741,14 @@ worldserver.addWorldInfoToCrashReport(crashreport); throw new ReportedException(crashreport); } -@@ -645,10 +978,12 @@ +@@ -645,10 +978,13 @@ FMLCommonHandler.instance().onPostWorldTick(worldserver); this.theProfiler.endSection(); this.theProfiler.startSection("tracker"); + worldserver.timings.tracker.startTiming(); // Spigot worldserver.getEntityTracker().updateTrackedEntities(); + worldserver.timings.tracker.stopTiming(); // Spigot ++ worldserver.mCapture.clearAllData(); this.theProfiler.endSection(); this.theProfiler.endSection(); - } @@ -755,7 +756,7 @@ worldTickTimes.get(id)[this.tickCounter % 100] = System.nanoTime() - j; } -@@ -656,15 +991,21 @@ +@@ -656,15 +992,21 @@ this.theProfiler.endStartSection("dim_unloading"); DimensionManager.unloadWorlds(worldTickTimes); this.theProfiler.endStartSection("connection"); @@ -777,7 +778,7 @@ this.theProfiler.endSection(); } -@@ -699,6 +1040,13 @@ +@@ -699,6 +1041,13 @@ public WorldServer worldServerForDimension(int p_71218_1_) { @@ -791,7 +792,7 @@ WorldServer ret = DimensionManager.getWorld(p_71218_1_); if (ret == null) { -@@ -784,13 +1132,14 @@ +@@ -784,13 +1133,14 @@ public List getPossibleCompletions(ICommandSender p_71248_1_, String p_71248_2_) { @@ -810,7 +811,7 @@ if (list != null) { -@@ -798,40 +1147,25 @@ +@@ -798,40 +1148,25 @@ while (iterator.hasNext()) { @@ -859,7 +860,7 @@ } public static MinecraftServer getServer() -@@ -1034,7 +1368,7 @@ +@@ -1034,7 +1369,7 @@ public boolean isServerInOnlineMode() { @@ -868,7 +869,7 @@ } public void setOnlineMode(boolean p_71229_1_) -@@ -1124,7 +1458,7 @@ +@@ -1124,7 +1459,7 @@ public NetworkSystem func_147137_ag() { @@ -877,7 +878,7 @@ } @SideOnly(Side.CLIENT) -@@ -1259,8 +1593,11 @@ +@@ -1259,8 +1594,11 @@ { Bootstrap.func_151354_b(); @@ -889,7 +890,7 @@ boolean flag = true; String s = null; String s1 = "."; -@@ -1356,16 +1693,34 @@ +@@ -1356,16 +1694,34 @@ { dedicatedserver.setGuiEnabled(); } @@ -930,7 +931,7 @@ } catch (Exception exception) { -@@ -1400,15 +1755,70 @@ +@@ -1400,15 +1756,70 @@ @SideOnly(Side.SERVER) public String getPlugins() { @@ -1006,7 +1007,7 @@ } @SideOnly(Side.SERVER) -@@ -1455,9 +1865,213 @@ +@@ -1455,9 +1866,213 @@ return this.serverStopped; }