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

Overhaul to Timings and Entity Activation Range

Browse Source 
This greatly extends the timings improvements I've done in recent commits, and brings timings to fully cover the entire tick.
The timings system also now tracks when specific timings causes the server to lose TPS.
The timings are also able to be turned on "on demand", meaning you do not need to restart the server to enable them.

This commit also overhauls the Entity Activation Range feature, fixing bugs, adding more immunities, and improving the performance of it.
It also fixes a regression with a recent Spigot commit that broke the entire Entity Activation Range feature.

This commit had to move the Tick Loop patch before timings because there was a change done there to time the entire tick, so lots of renames.

These 2 commits had to be bundled together to simplify applying them and reduce redundant conflict resolution.

By: Aikar <aikar@aikar.co>
This commit is contained in:
Spigot
2013-02-26 12:21:40 -05:00
parent 7c1adc0df4
commit 3be016271f
17 changed files with 1503 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0029-Netty.patch
View File

@@ -1,4 +1,4 @@
From d8aa2999094cf94e7a231d7ff5bd0b034ba5ba8a Mon Sep 17 00:00:00 2001
From 9f7d30b2630ab0b4f7f3f650456f08dd6c6409b6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 14 Feb 2013 17:32:20 +1100
Subject: [PATCH] Netty
@@ -223,10 +223,10 @@ index 58d30eb..e4e5049 100644
// CraftBukkit end
this.pendingConnection = pendingconnection;
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 15acc97..dbc3e48 100644
index 6f54f7e..2ba6c14 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -18,6 +18,8 @@ public class Spigot {
@@ -23,6 +23,8 @@ public class Spigot {
public static boolean tabPing = false;
private static Metrics metrics;
@@ -235,7 +235,7 @@ index 15acc97..dbc3e48 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -53,6 +55,12 @@ public class Spigot {
@@ -58,6 +60,12 @@ public class Spigot {
tabPing = configuration.getBoolean("settings.tab-ping", tabPing);
@@ -1185,7 +1185,7 @@ index 0000000..5dc3754
+ DATA;
+}
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index e04ebce..7ccac52 100644
index 7c18391..45a8a00 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -34,6 +34,8 @@ settings:
@@ -1198,5 +1198,5 @@ index e04ebce..7ccac52 100644
default:
growth-chunks-per-tick: 650
--
1.8.1-rc2
1.8.1.1