Fix shade fix accidentally being unmerged

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-04 19:57:08 +11:00
parent 74b11192c3
commit d908152b5e
8 changed files with 33 additions and 33 deletions

View File

@@ -1,11 +1,11 @@
From 9b65fde8e1bbddb11b5e9a8faa5528e4dca6e9c1 Mon Sep 17 00:00:00 2001
From 80b6402b3418bbaa834f68b7fc852bd3d81908a0 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 cdc41b4..1a9df71 100644
index c1c4aa0..5db21fd 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 cdc41b4..1a9df71 100644
public MinecraftServer(OptionSet options, Proxy proxy) { // CraftBukkit - signature file -> OptionSet
i = this;
@@ -412,45 +418,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -418,45 +424,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void run() {
try {
if (this.init()) {