swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-03 03:15:55 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'testing' of stellabellum.net:staff/dsrc into testing

Browse Source
This commit is contained in:
Cekis
2016-07-30 16:44:03 +01:00
parent 2d2f49aedc 562efd8e23
commit a41cdb7506
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/ai/beast.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class beast extends script.base_script
public static final int PING_INTERVAL = 120;
public static final int PING_INTERVAL_RETRY = 30;
public static final float MAX_DISTANCE_FROM_MASTER = 128.0f;
public static final boolean BEAST_DEBUG = true;
public static final boolean BEAST_DEBUG = false;
public static final string_id PCOLOR = new string_id("sui", "set_primary_color");
public void blog(String text) throws InterruptedException
{
sku.0/sys.server/compiled/game/script/library/beast_lib.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class beast_lib extends script.base_script
public static final int BEASTS_STORED_MAXIMUM = 10;
public static final int BEAST_LEVEL_MAX_DIFFERENCE = 10;
public static final int STEROID_BUFF_LEVEL_CAP = 74;
public static final boolean BEAST_DEBUG = true;
public static final boolean BEAST_DEBUG = false;
public static final string_id SID_BEAST_TOO_HIGH_LEVEL = new string_id("beast", "cant_call_level");
public static final string_id SID_MAXIMUM_BEASTS = new string_id("beast", "cant_call_maximum");
public static final string_id SID_STORED = new string_id("beast", "stored");
sku.0/sys.server/compiled/game/script/library/group.java
-1
View File
@@ -508,7 +508,6 @@ public class group extends script.base_script
}
}
}
int debug = amt - totalDividends;
prose_package ppSplit = prose.getPackage(PROSE_SPLIT_COINS_SELF, null, Integer.toString(amt), null, null, Integer.toString(amt - totalDividends), null, null, null, null, 0, 0.0f);
sendSystemMessageProse(actor, ppSplit);
}
sku.0/sys.server/compiled/game/script/script_class_loader.java
+15 -3
View File
@@ -14,6 +14,7 @@ import java.util.ArrayList;
import java.util.Hashtable;
import java.util.TreeSet;
public class script_class_loader extends ClassLoader
{
// keep a dummy method object around to identify methods that are missing from scripts
@@ -36,7 +37,6 @@ public class script_class_loader extends ClassLoader
*/
private script_class_loader(String name) throws ClassNotFoundException
{
// System.out.println("Creating new class loader for class " + name);
// initialize basic data
myClassName = name;
@@ -106,7 +106,13 @@ public class script_class_loader extends ClassLoader
*/
public static boolean unloadClass(String name)
{
System.out.println("script_class_loader unloadClass " + name);
String flag = base_class.getConfigSetting("GameServer", "scriptListLoadUnload");
if (!(flag == null || flag.length() < 1))
{
System.out.println("script_class_loader unloadClass " + name);
}
boolean result = false;
if (loaderCache.containsKey(name))
@@ -285,7 +291,13 @@ public class script_class_loader extends ClassLoader
// if the script name has '.' in it, convert them to '\'
String pathedName = name.replace('.', java.io.File.separatorChar);
String fullname = script_entry.getScriptPath() + pathedName + ".class";
System.out.println("loadClassData " + fullname);
String flag = base_class.getConfigSetting("GameServer", "scriptListLoadUnload");
if (!(flag == null || flag.length() < 1))
{
System.out.println("loadClassData " + fullname);
}
try
{
sku.0/sys.server/compiled/game/script/script_entry.java
+1 -2
View File
@@ -90,8 +90,7 @@ public class script_entry
private static void checkEnableProfiling()
{
String result = base_class.getConfigSetting("GameServer", "javaEngineProfiling");
boolean ret = result != null && (result.equals("on") || result.equals("1") || result.equals("true"));
System.err.println("Profiling: " + ret);
boolean ret = (result != null && (result.equals("on") || result.equals("1") || result.equals("true")));
ENABLE_PROFILING = ret;
profileSettingInitialized = true;
}