swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-09-12 23:45:12 -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/structure/structure_rollup.java
+13 -20
View File
@@ -30,9 +30,8 @@ public class structure_rollup extends script.base_script
String subject_str = "@" + subject.toString();
body_oob = chatAppendPersistentMessageWaypointData(body_oob, where.area, where.x, where.z, null, structName);
String[] admins = player_structure.getAdminListNames(self);
for (int i = 0; i < admins.length; ++i)
{
chatSendPersistentMessage("Galactic Housing Authority", admins[i], subject_str, null, body_oob);
for (String admin : admins) {
chatSendPersistentMessage("Galactic Housing Authority", admin, subject_str, null, body_oob);
}
if (city.isInCity(self))
{
@@ -69,30 +68,24 @@ public class structure_rollup extends script.base_script
obj_id[] players = player_structure.getPlayersInBuilding(self);
if (players != null)
{
for (int i = 0; i < players.length; i++)
{
expelFromBuilding(players[i]);
for (obj_id player1 : players) {
expelFromBuilding(player1);
}
}
String[] cells = getCellNames(self);
if (cells != null)
{
for (int i = 0; i < cells.length; i++)
{
obj_id cellid = getCellId(self, cells[i]);
for (String cell : cells) {
obj_id cellid = getCellId(self, cell);
obj_id contents[] = getContents(cellid);
if (contents != null)
{
for (int j = 0; j < contents.length; j++)
{
if (hasCondition(contents[j], CONDITION_VENDOR))
{
obj_id owner = getObjIdObjVar(contents[j], "vendor_owner");
if (!isIdValid(owner))
{
owner = getOwner(contents[j]);
if (contents != null) {
for (obj_id content : contents) {
if (hasCondition(content, CONDITION_VENDOR)) {
obj_id owner = getObjIdObjVar(content, "vendor_owner");
if (!isIdValid(owner)) {
owner = getOwner(content);
}
vendor_lib.finalizePackUp(owner, contents[j], player, player_structure.isAbandoned(self));
vendor_lib.finalizePackUp(owner, content, player, player_structure.isAbandoned(self));
}
}
}