projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-19 09:03:02 -04:00
Code Issues Projects Releases Wiki Activity

Changed a majority of Holocore to use the Log class

Browse Source
This commit is contained in:
Obique PSWG
2016-05-13 17:36:59 -05:00
parent b5f2114cbd
commit 842dfdf136
50 changed files with 136 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ClientBuildoutService.java
+3 -13
View File
@@ -68,7 +68,7 @@ public class ClientBuildoutService extends Service {
public Collection<SWGObject> loadClientObjects() {
Collection<SWGObject> objects;
long startLoad = System.nanoTime();
logInfo("Loading client objects...");
Log.i(this, "Loading client objects...");
try {
loadAreas(getEvents());
if (getConfig(ConfigFile.PRIMARY).getBoolean("LOAD-OBJECTS", true))
@@ -81,7 +81,7 @@ public class ClientBuildoutService extends Service {
Log.e(this, e);
}
double loadTime = (System.nanoTime() - startLoad) / 1E6;
logInfo("Finished loading %d client objects. Time: %fms", objects.size(), loadTime);
Log.i(this, "Finished loading %d client objects. Time: %fms", objects.size(), loadTime);
return objects;
}
@@ -190,8 +190,6 @@ public class ClientBuildoutService extends Service {
}
private void setObjectArea(SWGObject obj) {
if (obj.getObjectId() == -507780858040143424L)
System.out.println("MENSIX " + obj.getParent());
if (obj.getParent() != null) {
obj.setBuildoutArea(null);
return;
@@ -201,10 +199,7 @@ public class ClientBuildoutService extends Service {
if (area == null || !isWithin(area, world.getTerrain(), world.getX(), world.getZ())) {
area = getAreaForObject(obj);
obj.setBuildoutArea(area);
if (obj.getObjectId() == -507780858040143424L)
System.out.println(" AREA: " + area);
} else if (obj.getObjectId() == -507780858040143424L)
System.out.println(" NOT SET");
}
}
private BuildoutArea createArea(ResultSet set, AreaIndexes ind) throws SQLException {
@@ -232,11 +227,6 @@ public class ClientBuildoutService extends Service {
return area.getTerrain() == t && x >= area.getX1() && x <= area.getX2() && z >= area.getZ1() && z <= area.getZ2();
}
private void logInfo(String message, Object ... args) {
System.out.printf(getClass().getSimpleName() + ": " + message + "%n", args);
Log.i(this, message, args);
}
private static class AreaIndexes {
private int id;