swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-09-21 07:13:00 -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/obj_var.java
+7 -7
View File
@@ -35,7 +35,7 @@ public class obj_var implements Comparable, Serializable
public obj_var(String name, int data)
{
m_name = name;
m_data = new Integer(data);
m_data = data;
} // obj_var(String, int)
/**
@@ -50,7 +50,7 @@ public class obj_var implements Comparable, Serializable
// m_data = Array.newInstance(Class.forName("java.lang.Integer"), data.length);
m_data = new int[data.length];
for ( int i = 0; i < data.length; ++i )
Array.set(m_data, i, new Integer(data[i]));
Array.set(m_data, i, data[i]);
} // obj_var(String, int[])
/**
@@ -62,7 +62,7 @@ public class obj_var implements Comparable, Serializable
public obj_var(String name, float data)
{
m_name = name;
m_data = new Float(data);
m_data = data;
} // obj_var(String, float)
/**
@@ -77,7 +77,7 @@ public class obj_var implements Comparable, Serializable
// m_data = Array.newInstance(Class.forName("java.lang.Float"), data.length);
m_data = new float[data.length];
for ( int i = 0; i < data.length; ++i )
Array.set(m_data, i, new Float(data[i]));
Array.set(m_data, i, data[i]);
} // obj_var(String, float[])
/**
@@ -320,7 +320,7 @@ public class obj_var implements Comparable, Serializable
{
try
{
return ((Integer)m_data).intValue();
return (Integer) m_data;
}
catch( ClassCastException err )
{
@@ -352,7 +352,7 @@ public class obj_var implements Comparable, Serializable
{
try
{
return ((Float)m_data).floatValue();
return (Float) m_data;
}
catch( ClassCastException err )
{
@@ -388,7 +388,7 @@ public class obj_var implements Comparable, Serializable
{
try
{
return ((Integer)m_data).intValue() != 0;
return (Integer) m_data != 0;
}
catch( ClassCastException err )
{