SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
11
0
Fork 0
Code Issues 32 Pull-Requests Projekte Releases Wiki Aktivität

Merge branch 'master' into SimulatorPreview

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2023-08-31 17:45:14 +02:00
Commit e42e123aaa
3 geänderte Dateien mit 11 neuen und 13 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLever.java
Datei anzeigen

@ -42,7 +42,7 @@ public class LoaderLever extends LoaderInteractionElement<LoaderLever.LeverSetti
public class LeverSettings implements ElementSettings {
private boolean noop = false;
private boolean interact = false;
private boolean interact = true;
private boolean power = false;
@Override

17
BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
Datei anzeigen

@ -29,7 +29,7 @@ import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.linkage.Linked;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserGroup;
import de.steamwar.sql.UserPerm;
import net.md_5.bungee.api.chat.ClickEvent;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@ -52,10 +52,9 @@ public class SkinCommand extends SWCommand {
@Register(help = true)
public void genericHelp(Player p, String... args) {
SteamwarUser steamwarUser = SteamwarUser.get(p.getUniqueId());
UserGroup userGroup = steamwarUser.getUserGroup();
SteamwarUser user = SteamwarUser.get(p.getUniqueId());
if (!userGroup.isAdminGroup()) {
if (!user.hasPerm(UserPerm.ADMINISTRATION)) {
return;
}
@ -64,10 +63,9 @@ public class SkinCommand extends SWCommand {
@Register
public void createCommand(Player p, @OptionalValue("") @Mapper("force") String force, @Mapper("kuerzel") String typeKuerzel, @Mapper("creator") String creator, String... names) {
SteamwarUser steamwarUser = SteamwarUser.get(p.getUniqueId());
UserGroup userGroup = steamwarUser.getUserGroup();
SteamwarUser user = SteamwarUser.get(p.getUniqueId());
if (!userGroup.isAdminGroup()) {
if (!user.hasPerm(UserPerm.ADMINISTRATION)) {
return;
}
Region region = Region.getRegion(p.getLocation());
@ -113,10 +111,9 @@ public class SkinCommand extends SWCommand {
@Register("boundary")
public void showRegionBoundaries(Player p) {
SteamwarUser steamwarUser = SteamwarUser.get(p.getUniqueId());
UserGroup userGroup = steamwarUser.getUserGroup();
SteamwarUser user = SteamwarUser.get(p.getUniqueId());
if (!userGroup.isAdminGroup()) {
if (!user.hasPerm(UserPerm.ADMINISTRATION)) {
return;
}
if (BoundaryViewer.viewers.contains(p)) {

5
BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
Datei anzeigen

@ -26,6 +26,7 @@ import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.Linked;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -53,8 +54,8 @@ public class StopCommand extends SWCommand {
if (Permission.hasPermission(player, Permission.WORLD)) {
return true;
}
SteamwarUser steamwarUser = SteamwarUser.get(player.getUniqueId());
if (steamwarUser.getUserGroup().isAdminGroup()) {
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
if (user.hasPerm(UserPerm.ADMINISTRATION)) {
return true;
}
messageSender.send("STOP_NO_PERMS");