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

Java 11.0.2 migration (#32)

Browse Source 
* Code compiles - execution NOT tested

* updating gitignore

* Removed intellij settings files

* Removed more intellij files

* Added exclusion for JDK classes.

* Fixed purchasing script for vendors that have listed coin types.

* Updated script to not kick off until the entire preload is complete.

* adds static name entry for Solo movie poster and tcg9 vendor entry

* clean up empty and orphaned object templates

* adds placeholder black market (static) spawns

* corrects entries for the video game table to correctly set it in tcg series 2 and remove series 1 console errors

* Updated gitignore and removed intellij project files

* Fixed appearance reference for thranta payroll and kashyyyk door, added skipLosCheck objvar due to cannit see issue. Requires updated src

* Fixed appearance and template for terminal (#2)

* Fixed appearance and template for terminal (#3)

* Fixed appearance and template for terminal (#4)

* Deleted another faulty/orphaned object template

* Fixed gcw ranks option on frog. Only issue is that it doesn't award the officer commands or badges.

* Fixed some unneeded java 11 changes
This commit is contained in:
Tekaoh
2019-04-18 18:31:52 -05:00
committed by GitHub
parent a4298e618f
commit 5c2e112349
1815 changed files with 36918 additions and 49649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/script_entry.java
+26 -27
View File
@@ -249,14 +249,12 @@ public class script_entry
// put the function names into an array, filtering out functions that are derived from base_class.java
// and other non-script classes
Vector functions = new Vector();
for ( int i = 0; i < scriptMethods.length; ++i )
{
if (scriptMethods[i].getDeclaringClass() != baseClass &&
scriptMethods[i].getDeclaringClass() != objectClass)
{
functions.add(scriptMethods[i].getName());
}
}
for (Method scriptMethod : scriptMethods) {
if (scriptMethod.getDeclaringClass() != baseClass &&
scriptMethod.getDeclaringClass() != objectClass) {
functions.add(scriptMethod.getName());
}
}
// convert the Vector of function names to an array
String[] returnValue = new String[functions.size()];
@@ -336,6 +334,7 @@ public class script_entry
*
* @return SCRIPT_CONTINUE or SCRIPT_OVERRIDE
*/
@SuppressWarnings("deprecation")
public static int runScript(String script, String method, Object[] params) throws internal_script_error, internal_script_exception
{
boolean scriptCalled = false;
@@ -434,7 +433,7 @@ public class script_entry
Object scriptResult = meth.invoke(obj, params);
if ( scriptResult != null )
result = ((Integer)scriptResult).intValue();
result = (Integer) scriptResult;
}
}
catch (NoSuchMethodException err)
@@ -673,6 +672,7 @@ public class script_entry
*
* @return SCRIPT_CONTINUE or SCRIPT_OVERRIDE
*/
@SuppressWarnings("deprecation")
public static int callMessageHandler(String script, String method, Object[] params) throws internal_script_error, internal_script_exception
{
boolean scriptCalled = false;
@@ -744,7 +744,7 @@ public class script_entry
Object scriptResult = meth.invoke(obj, params);
if ( scriptResult != null )
result = ((Integer)scriptResult).intValue();
result = (Integer) scriptResult;
}
}
catch (NoSuchMethodException err)
@@ -936,27 +936,25 @@ public class script_entry
if(object.getLockCount() > 1)
{
String[] scripts = object.getScripts();
for (int i = 0; i < scripts.length; ++i)
{
result = callMessageHandler(scripts[i], method, paramArray);
if (result != base_class.SCRIPT_CONTINUE)
break;
}
for (String script : scripts) {
result = callMessageHandler(script, method, paramArray);
if (result != base_class.SCRIPT_CONTINUE)
break;
}
}
else
{
ArrayList scripts = object.getScriptArrayList();
for (int i = 0; i < scripts.size(); ++i)
{
// String script = "script." + (String)scripts.get(i);
// scriptNameBuffer.setLength("script.".length());
// scriptNameBuffer.append(script);
// script = scriptNameBuffer.toString();
// result = callMessageHandler(scriptNameBuffer.toString(), method, paramArray);
result = callMessageHandler((String)scripts.get(i), method, paramArray);
if (result != base_class.SCRIPT_CONTINUE)
break;
}
for (Object script : scripts) {
// String script = "script." + (String)scripts.get(i);
// scriptNameBuffer.setLength("script.".length());
// scriptNameBuffer.append(script);
// script = scriptNameBuffer.toString();
// result = callMessageHandler(scriptNameBuffer.toString(), method, paramArray);
result = callMessageHandler((String) script, method, paramArray);
if (result != base_class.SCRIPT_CONTINUE)
break;
}
}
}
catch (ClassCastException err)
@@ -990,6 +988,7 @@ public class script_entry
*
* @return the string returned from the handler function
*/
@SuppressWarnings("deprecation")
public static String runConsoleHandler(String script, String method, Object[] params) throws internal_script_error, internal_script_exception
{
boolean scriptCalled = false;