SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Merge pull request 'Fix prepare recoloring' (#276) from fixPrepare into master

Quellcode durchsuchen 
Reviewed-on: #276
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
Lixfel 2021-05-24 09:56:41 +02:00
Commit a017df7caa
1 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
FightSystem_Main/src/de/steamwar/fightsystem/fight/FightSchematic.java
Datei anzeigen

@ -118,7 +118,7 @@ public class FightSchematic extends StateDependent {
private void paste(){ private void paste(){
FreezeWorld freezer = new FreezeWorld(); FreezeWorld freezer = new FreezeWorld();
DyeColor c = ColorConverter.chat2dye(team.getColor()); DyeColor c = ArenaMode.AntiPrepare.contains(Config.mode) ? ColorConverter.chat2dye(team.getColor()) : DyeColor.PINK;
try { try {
VersionedRunnable.call(new VersionedRunnable(() -> { VersionedRunnable.call(new VersionedRunnable(() -> {
@ -126,25 +126,26 @@ public class FightSchematic extends StateDependent {
FightTeam_8.replaceTeamColor(clipboard, c); FightTeam_8.replaceTeamColor(clipboard, c);
FightTeam_8.pasteSchematic(clipboard, region, rotate); FightTeam_8.pasteSchematic(clipboard, region, rotate);
} catch (NoClipboardException | WorldEditException ex) { } catch (NoClipboardException | WorldEditException ex) {
throw new SecurityException("Error pasting arena in schematic", ex); throw new SecurityException("Error pasting schematic", ex);
} }
}, 8), new VersionedRunnable(() -> { }, 8), new VersionedRunnable(() -> {
try { try {
FightTeam_12.replaceTeamColor(clipboard, c); FightTeam_12.replaceTeamColor(clipboard, c);
FightTeam_8.pasteSchematic(clipboard, region, rotate); FightTeam_8.pasteSchematic(clipboard, region, rotate);
} catch (NoClipboardException | WorldEditException ex) { } catch (NoClipboardException | WorldEditException ex) {
throw new SecurityException("Error pasting arena in schematic", ex); throw new SecurityException("Error pasting schematic", ex);
} }
}, 12), new VersionedRunnable(() -> { }, 12), new VersionedRunnable(() -> {
try { try {
FightTeam_14.replaceTeamColor(clipboard, c); FightTeam_14.replaceTeamColor(clipboard, c);
FightTeam_14.pasteSchematic(clipboard, region, rotate); FightTeam_14.pasteSchematic(clipboard, region, rotate);
} catch (NoClipboardException | WorldEditException ex) { } catch (NoClipboardException | WorldEditException ex) {
throw new SecurityException("Error pasting arena in schematic", ex); throw new SecurityException("Error pasting schematic", ex);
} }
}, 14)); }, 14));
} catch (SecurityException securityException) { } catch (SecurityException securityException) {
team.broadcast(FightSystem.PREFIX + "§cFehler beim Pasten der Schematic"); Bukkit.broadcastMessage(FightSystem.PREFIX + "§cFehler beim Pasten der Schematic");
Bukkit.getScheduler().runTask(FightSystem.getPlugin(), FightSystem::setPreSchemState);
throw securityException; throw securityException;
} }