mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-15 05:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #45 & small things

Browse Source 
- Fixed Equals method for UserData
This commit is contained in:
Rsl1122 2017-03-11 09:31:54 +02:00
parent 446af674b8
commit a35e4fe940
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/src/main/java/com/djrapitops/plan/data/SessionData.java
View File

@ -51,4 +51,9 @@ public class SessionData {
public long getSessionEnd() {
return sessionEnd;
}
@Override
public String toString() {
return "s:" + sessionStart + " e:" + sessionEnd;
}
}

9
Plan/src/main/java/com/djrapitops/plan/data/UserData.java
View File

@ -681,15 +681,12 @@ public class UserData {
return false;
}
final UserData other = (UserData) obj;
if (this.accessing != other.accessing) {
return false;
}
if (this.registered != other.registered) {
return false;
}
if (this.lastPlayed != other.lastPlayed) {
return false;
}
// if (this.lastPlayed != other.lastPlayed) {
// return false;
// }
if (this.playTime != other.playTime) {
return false;
}

9
Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java vendored
View File

@ -354,15 +354,6 @@ public class DataCacheHandler {
return killHandler;
}
/**
* Returns the same value as Plan#getDB().
*
* @return Current instance of the Database,
*/
public Database getDB() {
return db;
}
/**
*
* @return

2
Plan/src/main/java/com/djrapitops/plan/data/handlers/ActivityHandler.java
View File

@ -33,7 +33,7 @@ public class ActivityHandler {
* @return true if data is not found.
*/
public boolean isFirstTimeJoin(UUID uuid) {
return !handler.getDB().wasSeenBefore(uuid);
return !plugin.getDB().wasSeenBefore(uuid);
}
/**

4
Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
View File

@ -43,7 +43,7 @@ public class HtmlUtils {
*/
public static String replacePlaceholders(String html, HashMap<String, String> replaceMap) {
for (String key : replaceMap.keySet()) {
html = html.replaceAll(key, replaceMap.get(key));
html = html.replace(key, replaceMap.get(key));
}
return html;
}
@ -81,7 +81,7 @@ public class HtmlUtils {
return url;
}
static String removeXSS(String string) {
public static String removeXSS(String string) {
return string.replaceAll("<!--", "")
.replaceAll("-->", "")
.replaceAll("<script>", "")