swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-13 04:13:01 -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/test/qascript.java
+22 -40
View File
@@ -255,11 +255,9 @@ public class qascript extends script.base_script
if (scriptArray.length > -1)
{
HashSet theSet = new HashSet();
for (int i = 0; i < scriptArray.length; i++)
{
String script = scriptArray[i];
if (script.indexOf("script.") > -1)
{
for (String s : scriptArray) {
String script = s;
if (script.contains("script.")) {
script = script.substring(7);
theSet.add(script);
}
@@ -279,19 +277,13 @@ public class qascript extends script.base_script
{
if (!scriptArray[0].equals(ERROR_MSG_ARRAY[0]))
{
for (int i = 0; i < scriptArray.length; i++)
{
if (scriptArray[i].startsWith("test."))
{
strScripts += scriptArray[i] + "\r\n";
}
else
{
for (int s = 0; s < COMMON_SCRIPTS.length; s++)
{
if (scriptArray[i].equals(COMMON_SCRIPTS[s]))
{
strScripts += scriptArray[i] + "\r\n";
for (String s : scriptArray) {
if (s.startsWith("test.")) {
strScripts += s + "\r\n";
} else {
for (String commonScript : COMMON_SCRIPTS) {
if (s.equals(commonScript)) {
strScripts += s + "\r\n";
}
}
}
@@ -309,19 +301,13 @@ public class qascript extends script.base_script
{
if (!scriptArray[0].equals(ERROR_MSG_ARRAY[0]))
{
for (int i = 0; i < scriptArray.length; i++)
{
if (scriptArray[i].startsWith("test."))
{
theSet.add(scriptArray[i]);
}
else
{
for (int s = 0; s < COMMON_SCRIPTS.length; s++)
{
if (scriptArray[i].equals(COMMON_SCRIPTS[s]))
{
theSet.add(scriptArray[i]);
for (String s : scriptArray) {
if (s.startsWith("test.")) {
theSet.add(s);
} else {
for (String commonScript : COMMON_SCRIPTS) {
if (s.equals(commonScript)) {
theSet.add(s);
}
}
}
@@ -337,11 +323,9 @@ public class qascript extends script.base_script
public String[] getAttachableCharacterScripts(obj_id player) throws InterruptedException
{
HashSet theSet = new HashSet();
for (int i = 0; i < COMMON_SCRIPTS.length; i++)
{
if (findAttached(player, COMMON_SCRIPTS[i]) == true)
{
theSet.add(COMMON_SCRIPTS[i]);
for (String commonScript : COMMON_SCRIPTS) {
if (findAttached(player, commonScript) == true) {
theSet.add(commonScript);
}
}
String[] menuArray = new String[theSet.size()];
@@ -354,10 +338,8 @@ public class qascript extends script.base_script
String[] arrayOfCurrentScripts = getCharacterScripts(player);
if (arrayOfCurrentScripts.length > -1)
{
for (int x = 0; x < arrayOfCurrentScripts.length; x++)
{
if (arrayOfCurrentScripts[x].equals(scriptAttached))
{
for (String arrayOfCurrentScript : arrayOfCurrentScripts) {
if (arrayOfCurrentScript.equals(scriptAttached)) {
return false;
}
}