Merge remote-tracking branch 'origin/ServerTeam' into ServerTeam
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Dieser Commit ist enthalten in:
Commit
344a08bbf7
@ -293,7 +293,7 @@ public class SchematicSelector {
|
|||||||
openFilter();
|
openFilter();
|
||||||
} else {
|
} else {
|
||||||
SWAnvilInv swAnvilInv = new SWAnvilInv(player, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_ENTER_OWNER", player));
|
SWAnvilInv swAnvilInv = new SWAnvilInv(player, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_ENTER_OWNER", player));
|
||||||
swAnvilInv.setItem(Material.PLAYER_HEAD);
|
swAnvilInv.setItem(SWItem.getMaterial("SKULL_ITEM"), (byte) 3);
|
||||||
swAnvilInv.setCallback(s -> {
|
swAnvilInv.setCallback(s -> {
|
||||||
if(SteamwarUser.get(s) != null) {
|
if(SteamwarUser.get(s) != null) {
|
||||||
filter.setOwner(SteamwarUser.get(s).getId());
|
filter.setOwner(SteamwarUser.get(s).getId());
|
||||||
|
@ -590,7 +590,7 @@ public class SQLProvider implements Provider {
|
|||||||
node.getParent(),
|
node.getParent(),
|
||||||
node.getItem(),
|
node.getItem(),
|
||||||
node.getType(),
|
node.getType(),
|
||||||
node.getRank(),
|
node.getRankUnsafe(),
|
||||||
node.replaceColor(),
|
node.replaceColor(),
|
||||||
node.allowReplay(),
|
node.allowReplay(),
|
||||||
node.getId()
|
node.getId()
|
||||||
|
@ -316,6 +316,11 @@ public class SchematicNode {
|
|||||||
return rank;
|
return rank;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public int getRankUnsafe() {
|
||||||
|
return rank;
|
||||||
|
}
|
||||||
|
|
||||||
public void setRank(int rank) {
|
public void setRank(int rank) {
|
||||||
if(isDir)
|
if(isDir)
|
||||||
throw new SecurityException("Node is Directory");
|
throw new SecurityException("Node is Directory");
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren