Merge pull request #39 from way-zer/3.0

fix NPE when init in server.

Author: way-zer

src/main/kotlin/cf/wayzer/contentsTweaker/CTNode.kt

@@ -162,7 +162,7 @@ class CTNode private constructor() : ExtendableClass<CTExtInfo>() {
         }
 
         val resetHandlers = mutableSetOf<Resettable>()
-        private val afterHandlers = mutableSetOf<AfterHandler>()
+        internal val afterHandlers = mutableSetOf<AfterHandler>()
 
         fun modified(modifiable: Modifiable<*>) {
             resetHandlers.add(modifiable)

src/main/kotlin/cf/wayzer/contentsTweaker/ContentsTweaker.kt

@@ -34,6 +34,7 @@ object ContentsTweaker {
     )
 
     fun afterHandle() {
+        if (CTNode.PatchHandler.afterHandlers.isEmpty()) return
         val time = measureTimeMillis {
             CTNode.PatchHandler.doAfterHandle()
         }

src/main/kotlin/cf/wayzer/contentsTweaker/ModMain.kt

@@ -33,15 +33,17 @@ class ModMain : Mod() {
             }
             ContentsTweaker.afterHandle()
         }
-        Vars.netClient.addPacketHandler("ContentsLoader|newPatch") {
-            val (name, content) = it.split('\n', limit = 2)
-            ContentsTweaker.loadPatch(name, content)
-        }
-        //TODO: Deprecated
-        Vars.netClient.addPacketHandler("ContentsLoader|loadPatch") { name ->
-            val patch = Vars.state.map.tags.get("CT@$name")
-                ?: return@addPacketHandler Call.serverPacketReliable("ContentsLoader|requestPatch", name)
-            ContentsTweaker.loadPatch(name, patch)
+        if (Vars.netClient != null) {
+            Vars.netClient.addPacketHandler("ContentsLoader|newPatch") {
+                val (name, content) = it.split('\n', limit = 2)
+                ContentsTweaker.loadPatch(name, content)
+            }
+            //TODO: Deprecated
+            Vars.netClient.addPacketHandler("ContentsLoader|loadPatch") { name ->
+                val patch = Vars.state.map.tags.get("CT@$name")
+                    ?: return@addPacketHandler Call.serverPacketReliable("ContentsLoader|requestPatch", name)
+                ContentsTweaker.loadPatch(name, patch)
+            }
         }
         Vars.mods.scripts.scope.apply {
             put("CT", this, ContentsTweaker)