SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

Adapt to CommonDB #139

Zusammengeführt
YoyoNow hat 3 Commits von commonDB nach master 2022-11-12 15:33:33 +01:00 zusammengeführt
Diskussion 0 Commits 3 Geänderte Dateien 3 +7 -5
3 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit 86b22cd0a1 werden angezeigt - Alle Commits anzeigen

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

@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.world;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.sql.SchematicData;
import de.steamwar.sql.SchematicNode; import de.steamwar.sql.SchematicNode;
import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.SteamwarUser;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -38,7 +39,7 @@ public class ClipboardListener implements Listener {
try { try {
SchematicNode schematic = SchematicNode.getSchematicNode(SteamwarUser.get(e.getPlayer().getUniqueId()).getId(), CLIPBOARD_SCHEMNAME, 0); SchematicNode schematic = SchematicNode.getSchematicNode(SteamwarUser.get(e.getPlayer().getUniqueId()).getId(), CLIPBOARD_SCHEMNAME, 0);
if (schematic != null) { if (schematic != null) {
schematic.loadToPlayer(e.getPlayer()); new SchematicData(schematic).loadToPlayer(e.getPlayer());
} }
} catch (Exception ex) { } catch (Exception ex) {
// ignore cause players do all kind of stuff with schematics.... like massively oversized schems // ignore cause players do all kind of stuff with schematics.... like massively oversized schems
@ -55,7 +56,7 @@ public class ClipboardListener implements Listener {
} }
try { try {
schematic.saveFromPlayer(e.getPlayer()); new SchematicData(schematic).saveFromPlayer(e.getPlayer());
} catch (Exception ex) { } catch (Exception ex) {
if (newSchem) { if (newSchem) {
schematic.delete(); schematic.delete();

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

@ -54,7 +54,7 @@ public class StopCommand extends SWCommand {
if (Permission.hasPermission(player, Permission.WORLD)) { if (Permission.hasPermission(player, Permission.WORLD)) {
return true; return true;
} }
SteamwarUser steamwarUser = SteamwarUser.get(player); SteamwarUser steamwarUser = SteamwarUser.get(player.getUniqueId());
if (steamwarUser.getUserGroup().isAdminGroup()) { if (steamwarUser.getUserGroup().isAdminGroup()) {
return true; return true;
} }

5
BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
Datei anzeigen

@ -33,6 +33,7 @@ import de.steamwar.bausystem.region.utils.RegionType;
import de.steamwar.bausystem.shared.SizedStack; import de.steamwar.bausystem.shared.SizedStack;
import de.steamwar.bausystem.utils.FlatteningWrapper; import de.steamwar.bausystem.utils.FlatteningWrapper;
import de.steamwar.core.Core; import de.steamwar.core.Core;
import de.steamwar.sql.SchematicData;
import de.steamwar.sql.SchematicNode; import de.steamwar.sql.SchematicNode;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
@ -457,7 +458,7 @@ public class Region {
tempFile = prototype.getSkinMap().get(skin).getTestblockSchematicFile(); tempFile = prototype.getSkinMap().get(skin).getTestblockSchematicFile();
pastePoint = pastePoint.add(0, 0, prototype.getTestblock().getSizeZ() / 2); pastePoint = pastePoint.add(0, 0, prototype.getTestblock().getSizeZ() / 2);
} else { } else {
clipboard = schematic.load(); clipboard = new SchematicData(schematic).load();
int dz = Math.abs(clipboard.getOrigin().getZ() - clipboard.getMinimumPoint().getZ()); int dz = Math.abs(clipboard.getOrigin().getZ() - clipboard.getMinimumPoint().getZ());
if (dz < 2 || dz > prototype.getTestblock().getSizeZ()) { if (dz < 2 || dz > prototype.getTestblock().getSizeZ()) {
pastePoint = pastePoint.add(0, 0, prototype.getTestblock().getSizeZ() / 2); pastePoint = pastePoint.add(0, 0, prototype.getTestblock().getSizeZ() / 2);
@ -482,7 +483,7 @@ public class Region {
EditSession editSession = null; EditSession editSession = null;
if (schematic != null) { if (schematic != null) {
editSession = paste(clipboard != null ? clipboard : schematic.load(), pastePoint, pasteOptions); editSession = paste(clipboard != null ? clipboard : new SchematicData(schematic).load(), pastePoint, pasteOptions);
} else { } else {
editSession = paste(tempFile, pastePoint, pasteOptions); editSession = paste(tempFile, pastePoint, pasteOptions);
} }