SteamWar/SpigotCore
Archiviert
13
0

Remove deprecated APIs #125

Zusammengeführt
Lixfel hat 7 Commits von removeDeprecated nach master 2022-02-01 11:24:52 +01:00 zusammengeführt
3 geänderte Dateien mit 49 neuen und 2 gelöschten Zeilen
Nur Änderungen aus Commit 8d05308cbf werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -279,7 +279,7 @@ public class SchematicSelector {
}
};
if(filter.getOwner() == null) {
inv.setItem(1, Material.PLAYER_HEAD, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER", player), ownerCallback);
inv.setItem(1, SWItem.getMaterial("SKULL_ITEM"), (byte) 3, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER", player), ownerCallback);
} else {
SteamwarUser tUser = SteamwarUser.get(filter.getOwner());
SWItem item = SWItem.getPlayerSkull(tUser.getUserName());

Datei anzeigen

@ -0,0 +1,47 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 SteamWar.de-Serverteam
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.providers;
import de.steamwar.sql.SteamwarUser;
import org.bukkit.Bukkit;
import java.util.UUID;
public class BauServerInfo {
private static Integer bauOwner = null;
static {
try {
bauOwner = Integer.parseInt(Bukkit.getWorlds().get(0).getName());
} catch (NumberFormatException e) {
try {
bauOwner = SteamwarUser.get(UUID.fromString(Bukkit.getWorlds().get(0).getName())).getId();
} catch (IllegalArgumentException ignored) {}
}
}
public static Integer getOwnerId() {
return bauOwner;
}
public static boolean isBauServer() {
return bauOwner != null;
}
}

Datei anzeigen

@ -53,7 +53,7 @@ public class Punishment {
public static boolean isPunished(SteamwarUser user, Punishment.PunishmentType type, Consumer<Punishment> callback) {
Punishment punishment = Punishment.getPunishmentOfPlayer(user.getId(), type);
if(punishment == null || punishment.isCurrent()) {
if(punishment == null || !punishment.isCurrent()) {
return false;
} else {
callback.accept(punishment);