worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Luck
2016-08-28 17:43:02 +01:00
Unverified
parent 0831585a27
commit 9f5e194a6e
21 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/utils/AbstractManager.java
+1 -1
View File
@@ -61,7 +61,7 @@ public abstract class AbstractManager<I, T extends Identifiable<I>> {
public void updateOrSet(T t) {
if (!isLoaded(t.getId())) {
// The object isn't already loaded
objects.put(t.getId(), t);
set(t);
} else {
copy(t, objects.get(t.getId()));
}
common/src/main/java/me/lucko/luckperms/utils/Node.java
+9 -21
View File
@@ -354,7 +354,7 @@ public class Node implements me.lucko.luckperms.api.Node {
}
public boolean hasExpired() {
return expireAt < (System.currentTimeMillis() / 1000L);
return isTemporary() && expireAt < (System.currentTimeMillis() / 1000L);
}
public Map<String, String> getExtraContexts() {
@@ -485,34 +485,26 @@ public class Node implements me.lucko.luckperms.api.Node {
}
}
if (other.getServer().isPresent() != this.getServer().isPresent()) {
if (other.getServer().isPresent() == this.getServer().isPresent()) {
if (other.getServer().isPresent()) {
if (!other.getServer().get().equalsIgnoreCase(this.getServer().get())) {
return false;
}
}
} else {
return false;
}
if (other.getWorld().isPresent() != this.getWorld().isPresent()) {
if (other.getWorld().isPresent() == this.getWorld().isPresent()) {
if (other.getWorld().isPresent()) {
if (!other.getWorld().get().equalsIgnoreCase(this.getWorld().get())) {
return false;
}
}
} else {
return false;
}
if (!other.getExtraContexts().equals(this.getExtraContexts())) {
return false;
}
if (other.isTemporary() != this.isTemporary()) {
return false;
}
return true;
}
@@ -522,34 +514,30 @@ public class Node implements me.lucko.luckperms.api.Node {
return false;
}
if (other.getServer().isPresent() != this.getServer().isPresent()) {
if (other.isTemporary() != this.isTemporary()) {
return false;
}
if (other.getServer().isPresent() == this.getServer().isPresent()) {
if (other.getServer().isPresent()) {
if (!other.getServer().get().equalsIgnoreCase(this.getServer().get())) {
return false;
}
}
} else {
return false;
}
if (other.getWorld().isPresent() != this.getWorld().isPresent()) {
if (other.getWorld().isPresent() == this.getWorld().isPresent()) {
if (other.getWorld().isPresent()) {
if (!other.getWorld().get().equalsIgnoreCase(this.getWorld().get())) {
return false;
}
}
} else {
return false;
}
if (!other.getExtraContexts().equals(this.getExtraContexts())) {
return false;
}
if (other.isTemporary() != this.isTemporary()) {
return false;
}
return true;
}