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

Find + replace saves the day

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-02 11:29:44 +10:00
parent 89967b6f12
commit fb624b9c57
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CraftBukkit-Patches/0014-Improved-Timings-System.patch
View File

@@ -1,4 +1,4 @@
From df973d43d513df224bd4b4f0c44107eff74c299f Mon Sep 17 00:00:00 2001
From 686a257cf480797672667e37893b63351f676ad8 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
@@ -26,14 +26,14 @@ index b73f69c..17934c0 100644
// CraftBukkit start - If we didn't need to load the chunk run the callback now
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0f7be97..c4fa4f3 100644
index 0f7be97..978b6ef 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Painting;
import org.bukkit.entity.Vehicle;
+import org.bukkit.CustomTimingsHandler; // Spigot
+import org.spigotmc.CustomTimingsHandler; // Spigot
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -132,7 +132,7 @@ index 965e6ce..58a4acb 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("looting");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3c80340..044db9f 100644
index 3c80340..db396b3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -6,7 +6,6 @@ import java.security.KeyPair;
@@ -158,7 +158,7 @@ index 3c80340..044db9f 100644
+ SpigotTimings.serverTickTimer.startTiming();
this.q();
+ SpigotTimings.serverTickTimer.stopTiming();
+ org.bukkit.CustomTimingsHandler.tick();
+ org.spigotmc.CustomTimingsHandler.tick();
}
// Spigot end
} else {
@@ -249,14 +249,14 @@ index bc55a77..2e1246e 100644
/* CraftBukkit start - No longer needed as we have already handled it in server.dispatchServerCommand above.
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index db3fc42..174546d 100644
index db3fc42..ffa9bb6 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,10 +4,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
+import org.bukkit.CustomTimingsHandler; // Spigot
+import org.spigotmc.CustomTimingsHandler; // Spigot
import org.bukkit.inventory.InventoryHolder; // CraftBukkit
public class TileEntity {
@@ -394,14 +394,14 @@ index 3a321da..a2f7fee 100644
public BiomeMeta a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
new file mode 100644
index 0000000..bbb6368
index 0000000..f5befbf
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
@@ -0,0 +1,110 @@
+package org.bukkit.craftbukkit;
+
+import net.minecraft.server.*;
+import org.bukkit.CustomTimingsHandler;
+import org.spigotmc.CustomTimingsHandler;
+import org.bukkit.scheduler.BukkitTask;
+
+import java.util.HashMap;
@@ -509,7 +509,7 @@ index 0000000..bbb6368
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index 55db3ff..df134e3 100644
index 55db3ff..d644d08 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -1,6 +1,8 @@
@@ -517,7 +517,7 @@ index 55db3ff..df134e3 100644
import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
+import org.bukkit.CustomTimingsHandler; // Spigot
+import org.spigotmc.CustomTimingsHandler; // Spigot
import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitTask;
@@ -553,5 +553,5 @@ index 55db3ff..df134e3 100644
long getPeriod() {
--
1.8.2.1
1.8.1.2