Skip to content
This repository was archived by the owner on Feb 3, 2024. It is now read-only.

Commit cf58beb

Browse files
PikachuEXEzml2008
authored andcommitted
Various fixes. Closes #1970
* Update POM to be able to compile ! Fix rank ladder fetching ! Fix when swapping group, the position of group changed unexpectedly
1 parent bbb76e1 commit cf58beb

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<dependency>
149149
<groupId>com.zachsthings</groupId>
150150
<artifactId>netevents</artifactId>
151-
<version>1.0</version>
151+
<version>1.1-SNAPSHOT</version>
152152
<scope>provided</scope>
153153
</dependency>
154154
<dependency>

src/main/java/ru/tehkode/permissions/PermissionGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void setRank(int rank) {
108108
* @return Name of rank ladder as String
109109
*/
110110
public String getRankLadder() {
111-
return this.getOwnOption("rank-ladder", "", "default");
111+
return this.getOwnOption("rank-ladder", null, "default");
112112
}
113113

114114
/**

src/main/java/ru/tehkode/permissions/PermissionUser.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package ru.tehkode.permissions;
2020

2121
import com.google.common.collect.Maps;
22+
import org.apache.commons.lang.Validate;
2223
import org.bukkit.Bukkit;
2324
import org.bukkit.entity.Player;
2425
import ru.tehkode.permissions.events.PermissionEntityEvent;
@@ -487,10 +488,15 @@ protected int getPromoterRankAndCheck(PermissionUser promoter, String ladderName
487488
}
488489

489490
protected void swapGroups(PermissionGroup src, PermissionGroup dst) {
491+
Validate.notNull(src);
492+
Validate.notNull(dst);
493+
490494
List<PermissionGroup> groups = new ArrayList<>(this.getParents());
495+
int indexOfSrcGroup = groups.indexOf(src);
496+
497+
Validate.isTrue(indexOfSrcGroup != -1);
491498

492-
groups.remove(src);
493-
groups.add(dst);
499+
groups.set(indexOfSrcGroup, dst);
494500

495501
this.setParents(groups);
496502
}

0 commit comments

Comments
 (0)