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

Merge in some stuff

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-14 17:58:22 +11:00
parent 098db09224
commit 5cd48cf621
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 71424df72027daf0b96555a580d54fc91909b8b5 Mon Sep 17 00:00:00 2001
From d8e3dd9843d4506465935ccfb39c6c1e9188f600 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
@@ -64,7 +64,7 @@ index fec07f8..0c1350e 100644
protected String H() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5db21fd..9543509 100644
index ce2aaf4..453e508 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
@@ -83,7 +83,7 @@ index 5db21fd..9543509 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -438,7 +438,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -442,7 +442,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
lastTick = curTime;
MinecraftServer.currentTick++;
@@ -94,7 +94,7 @@ index 5db21fd..9543509 100644
}
// Spigot end
} else {
@@ -563,6 +566,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -567,6 +570,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void u() {
this.methodProfiler.a("levels");
@@ -102,7 +102,7 @@ index 5db21fd..9543509 100644
// CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
@@ -571,7 +575,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -575,7 +579,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
processQueue.remove().run();
}
@@ -113,7 +113,7 @@ index 5db21fd..9543509 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
@@ -623,7 +630,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -627,7 +634,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@@ -123,7 +123,7 @@ index 5db21fd..9543509 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -632,14 +641,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -636,14 +645,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
this.methodProfiler.c("connection");
@@ -145,10 +145,10 @@ index 5db21fd..9543509 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index da1a7e7..c4ed619 100644
index d32bf3f..d34fea7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -915,6 +915,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -914,6 +914,7 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit end
private void handleCommand(String s) {
@@ -156,7 +156,7 @@ index da1a7e7..c4ed619 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -922,19 +923,23 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -921,19 +922,23 @@ public class PlayerConnection implements PacketPlayInListener {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {