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

revert changes to disabled plugins and scheduler.

Browse Source 
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
This commit is contained in:
Spigot
2013-04-03 02:20:29 -05:00
parent fcfb1b5cb0
commit 08676f42a0
52 changed files with 376 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,21 @@
From 30d1e78cd481297d45e30e4ca6d772b08aaf44e3 Mon Sep 17 00:00:00 2001
From f911a115312d4fe9347642dac63ba4714b3361fe 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
Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
---
.../net/minecraft/server/ChunkProviderServer.java | 2 +
src/main/java/net/minecraft/server/Entity.java | 5 +
.../java/net/minecraft/server/EntityLiving.java | 10 ++
.../java/net/minecraft/server/MinecraftServer.java | 17 +++-
.../net/minecraft/server/PlayerConnection.java | 5 +
src/main/java/net/minecraft/server/TileEntity.java | 2 +
src/main/java/net/minecraft/server/World.java | 17 ++++
.../java/net/minecraft/server/WorldServer.java | 4 +
.../java/org/bukkit/craftbukkit/SpigotTimings.java | 110 +++++++++++++++++++++
.../bukkit/craftbukkit/scheduler/CraftTask.java | 18 ++++
10 files changed, 189 insertions(+), 1 deletion(-)
.../net/minecraft/server/ChunkProviderServer.java | 2 +
src/main/java/net/minecraft/server/Entity.java | 5 +
.../java/net/minecraft/server/EntityLiving.java | 10 ++
.../java/net/minecraft/server/MinecraftServer.java | 17 +++-
.../net/minecraft/server/PlayerConnection.java | 5 +
src/main/java/net/minecraft/server/TileEntity.java | 2 +
src/main/java/net/minecraft/server/World.java | 17 +++
.../java/net/minecraft/server/WorldServer.java | 4 +
.../java/org/bukkit/craftbukkit/SpigotTimings.java | 110 ++++++++++++++++++++
.../bukkit/craftbukkit/scheduler/CraftTask.java | 18 +++
10 files changed, 189 insertions(+), 1 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -381,10 +381,10 @@ index 307171b..0afe88d 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5a49b4d..e41dfba 100644
index f63e364..0abfc35 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -169,9 +169,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -186,9 +186,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
// CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals
long time = this.worldData.getTime();
if (this.getGameRules().getBoolean("doMobSpawning") && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) {
@@ -397,7 +397,7 @@ index 5a49b4d..e41dfba 100644
this.methodProfiler.c("chunkSource");
this.chunkProvider.unloadChunks();
int j = this.a(1.0F);
@@ -197,6 +200,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -214,6 +217,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
this.Y();
this.getWorld().processChunkGC(); // CraftBukkit
@@ -566,5 +566,5 @@ index 55db3ff..df134e3 100644
long getPeriod() {
--
1.8.1-rc2
1.7.0.4