From 78f2e8f38ac3c3ccdcfd4de9e09e298d1352fcbd Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Tue, 10 Apr 2012 22:22:13 -0400
Subject: [PATCH] Merge in fixes from chickenbones for tick related problem and
 straighten out variable naming in ModLoaderModContainer

---
 .../server/MinecraftServer.java.patch         | 29 ++++++++++---------
 .../fml/server/ModLoaderModContainer.java     | 11 +++----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
index b398c901be..c581e6110e 100644
--- a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
+++ b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
@@ -25,19 +25,22 @@
          this.field_6033_f = new ServerConfigurationManager(this);
          this.field_6028_k[0] = new EntityTracker(this, 0);
          this.field_6028_k[1] = new EntityTracker(this, -1);
-@@ -370,6 +374,7 @@
-                         var7 = 0L;
+@@ -444,6 +448,8 @@
+ 
+     private void func_6018_h()
+     {
++        FMLServerHandler.instance().onPreTick();
++        
+         long var1 = System.nanoTime();
+         ArrayList var3 = new ArrayList();
+         Iterator var4 = field_6037_b.keySet().iterator();
+@@ -533,6 +539,8 @@
+         this.field_48076_G = Packet.field_48101_l;
+         this.field_48082_x[this.field_9014_h % 100] = Packet.field_48102_m - this.field_48077_H;
+         this.field_48077_H = Packet.field_48102_m;
++        
++        FMLServerHandler.instance().onPostTick();
                      }
  
-+                    FMLServerHandler.instance().onPreTick();
-                     var3 += var7;
-                     var1 = var5;
+     public void func_6010_a(String p_6010_1_, ICommandListener p_6010_2_)
  
-@@ -386,6 +391,7 @@
-                             this.func_6018_h();
-                         }
-                     }
-+                    FMLServerHandler.instance().onPostTick();
-                 }
-             }
-             else
diff --git a/server/cpw/mods/fml/server/ModLoaderModContainer.java b/server/cpw/mods/fml/server/ModLoaderModContainer.java
index 8424e69b39..bfc850f431 100644
--- a/server/cpw/mods/fml/server/ModLoaderModContainer.java
+++ b/server/cpw/mods/fml/server/ModLoaderModContainer.java
@@ -429,13 +429,14 @@ public class ModLoaderModContainer implements ModContainer
 
             if ("required-before".equals(depparts[0]) || "before".equals(depparts[0]))
             {
-                preDependencies.add(depparts[1]);
+            	postDependencies.add(depparts[1]);
             }
 
             if ("required-after".equals(depparts[0]) || "after".equals(depparts[0]))
             {
-                postDependencies.add(depparts[1]);
+                preDependencies.add(depparts[1]);
             }
+
         }
     }
 
@@ -458,7 +459,7 @@ public class ModLoaderModContainer implements ModContainer
             computeDependencies();
         }
 
-        return preDependencies;
+        return postDependencies;
     }
 
     @Override
@@ -468,10 +469,10 @@ public class ModLoaderModContainer implements ModContainer
         {
             computeDependencies();
         }
-
-        return postDependencies;
+        return preDependencies;
     }
 
+
     public String toString()
     {
         return modSource;