projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-08 23:13:25 -04:00
Code Issues Projects Releases Wiki Activity

Merge holocore/quality_assurance into buffs

Browse Source 
Conflicts:
	src/services/galaxy/GameManager.java
This commit is contained in:
Mads Boddum
2016-10-10 15:50:38 +02:00
parent fb54786f31 db9cba3910
commit f706aadc13
75 changed files with 4062 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/player/PlayerObject.java
+8 -7
View File
@@ -98,7 +98,8 @@ public class PlayerObject extends IntangibleObject {
return play3.getPlayTime();
}
public void setPlayTime(int playTime) {
public void updatePlayTime() {
int playTime = (int) (System.currentTimeMillis() / 1000);
play3.setPlayTime(playTime);
sendDelta(3, 9, playTime);
}
@@ -339,19 +340,19 @@ public class PlayerObject extends IntangibleObject {
public boolean addJoinedChannel(String path) {
synchronized (joinedChannels) {
return true;
// return true;
// TODO: Refactor
/*System.out.println("add joined channel: " + path);
return !joinedChannels.contains(path) && joinedChannels.add(path);*/
// System.out.println("add joined channel: " + path);
return !joinedChannels.contains(path) && joinedChannels.add(path);
}
}
public boolean removeJoinedChannel(String path) {
synchronized (joinedChannels) {
return true;
// return true;
// TODO: Refactor
/*System.out.println("remove joined channel: " + path);
return joinedChannels.remove(path);*/
// System.out.println("remove joined channel: " + path);
return joinedChannels.remove(path);
}
}