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

8
CraftBukkit-Patches/0015-Highly-Optimized-Tick-Loop.patch
View File

@@ -1,11 +1,11 @@
From 80b6402b3418bbaa834f68b7fc852bd3d81908a0 Mon Sep 17 00:00:00 2001
From afcc9e6c55d58da7b8234625b6257c8edcf78bc6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:28:17 +1100
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c1c4aa0..5db21fd 100644
index c78e47b..ce2aaf4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -101,6 +101,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -21,7 +21,7 @@ index c1c4aa0..5db21fd 100644
public MinecraftServer(OptionSet options, Proxy proxy) { // CraftBukkit - signature file -> OptionSet
i = this;
@@ -418,45 +424,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -422,45 +428,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void run() {
try {
if (this.init()) {
@@ -123,7 +123,7 @@ index 0000000..f114a31
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2f2752a..b5d611b 100644
index 3dfe4ed..1b0e1bf 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;