forked from SteamWar/SteamWar
Final fixes
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem;
|
package de.steamwar.bausystem;
|
||||||
|
|
||||||
import de.steamwar.WorldEditRendererCUIEditor;
|
import de.steamwar.core.WorldEditRendererCUIEditor;
|
||||||
import de.steamwar.bausystem.config.BauServer;
|
import de.steamwar.bausystem.config.BauServer;
|
||||||
import de.steamwar.bausystem.configplayer.Config;
|
import de.steamwar.bausystem.configplayer.Config;
|
||||||
import de.steamwar.bausystem.configplayer.ConfigConverter;
|
import de.steamwar.bausystem.configplayer.ConfigConverter;
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
package de.steamwar.fightsystem;
|
package de.steamwar.fightsystem;
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||||
import de.steamwar.WorldEditRendererCUIEditor;
|
import de.steamwar.core.WorldEditRendererCUIEditor;
|
||||||
import de.steamwar.core.Core;
|
import de.steamwar.core.Core;
|
||||||
import de.steamwar.fightsystem.commands.*;
|
import de.steamwar.fightsystem.commands.*;
|
||||||
import de.steamwar.fightsystem.countdown.*;
|
import de.steamwar.fightsystem.countdown.*;
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
|
|
||||||
package de.steamwar.core;
|
package de.steamwar.core;
|
||||||
|
|
||||||
import de.steamwar.WorldEditRendererCUIEditor;
|
|
||||||
import de.steamwar.entity.CAABox;
|
import de.steamwar.entity.CAABox;
|
||||||
import de.steamwar.entity.REntityServer;
|
import de.steamwar.entity.REntityServer;
|
||||||
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
@@ -80,7 +80,11 @@ public class WorldEditRendererWrapper20 implements WorldEditRendererWrapper {
|
|||||||
type = clipboard ? WorldEditRendererCUIEditor.Type.CLIPBOARD_OTHER : WorldEditRendererCUIEditor.Type.SELECTION_OTHER;
|
type = clipboard ? WorldEditRendererCUIEditor.Type.CLIPBOARD_OTHER : WorldEditRendererCUIEditor.Type.SELECTION_OTHER;
|
||||||
}
|
}
|
||||||
float width = type.getWidth(player).value;
|
float width = type.getWidth(player).value;
|
||||||
BlockData block = type.getMaterial(player).createBlockData();
|
Material material = type.getMaterial(player);
|
||||||
|
if (material == Material.BARRIER) {
|
||||||
|
hide(player, null, clipboard, true);
|
||||||
|
}
|
||||||
|
BlockData block = material.createBlockData();
|
||||||
|
|
||||||
BoxPair boxPair = boxes.computeIfAbsent(player, __ -> new HashMap<>()).computeIfAbsent(owner, __ -> new BoxPair());
|
BoxPair boxPair = boxes.computeIfAbsent(player, __ -> new HashMap<>()).computeIfAbsent(owner, __ -> new BoxPair());
|
||||||
CAABox box = boxPair.get(clipboard);
|
CAABox box = boxPair.get(clipboard);
|
||||||
|
|||||||
@@ -108,10 +108,10 @@ UNNOSCHEMSUBMITTING=§e{0} §7may now submit §e§lschematics§7 again§8.
|
|||||||
|
|
||||||
WORLDEDIT_CUI_TITLE = WorldEdit CUI
|
WORLDEDIT_CUI_TITLE = WorldEdit CUI
|
||||||
WORLDEDIT_CUI_TITLE_SUBMENU = WorldEdit CUI - {0}
|
WORLDEDIT_CUI_TITLE_SUBMENU = WorldEdit CUI - {0}
|
||||||
WORLDEDIT_CUI_SELECTION = Selection
|
WORLDEDIT_CUI_SELECTION = Own Selection
|
||||||
WORLDEDIT_CUI_CLIPBOARD = Clipboard
|
WORLDEDIT_CUI_CLIPBOARD = Own Clipboard
|
||||||
WORLDEDIT_CUI_SELECTION_OTHER = Selection Other
|
WORLDEDIT_CUI_SELECTION_OTHER = Other Selection
|
||||||
WORLDEDIT_CUI_CLIPBOARD_OTHER = Clipboard Other
|
WORLDEDIT_CUI_CLIPBOARD_OTHER = Other Clipboard
|
||||||
|
|
||||||
WORLDEDIT_CUI_MATERIAL_NAME = §eWorldEdit {0}
|
WORLDEDIT_CUI_MATERIAL_NAME = §eWorldEdit {0}
|
||||||
WORLDEDIT_CUI_MATERIAL_CLICK = §7Click to edit
|
WORLDEDIT_CUI_MATERIAL_CLICK = §7Click to edit
|
||||||
@@ -120,7 +120,7 @@ WORLDEDIT_CUI_WIDTH_NAME = §eWidth {0}
|
|||||||
WORLDEDIT_CUI_WIDTH_LORE = §8> §7{0}
|
WORLDEDIT_CUI_WIDTH_LORE = §8> §7{0}
|
||||||
WORLDEDIT_CUI_WIDTH_LORE_SELECTED = §8> §e{0}
|
WORLDEDIT_CUI_WIDTH_LORE_SELECTED = §8> §e{0}
|
||||||
WORLDEDIT_CUI_WIDTH_CLICK = §7Click to change
|
WORLDEDIT_CUI_WIDTH_CLICK = §7Click to change
|
||||||
WORLDEDIT_CUI_WIDTH_HUGE = 2/16 Block
|
WORLDEDIT_CUI_WIDTH_HUGE = 1/ 8 Block
|
||||||
WORLDEDIT_CUI_WIDTH_LARGE = 1/16 Block
|
WORLDEDIT_CUI_WIDTH_LARGE = 1/16 Block
|
||||||
WORLDEDIT_CUI_WIDTH_MEDIUM = 1/32 Block
|
WORLDEDIT_CUI_WIDTH_MEDIUM = 1/32 Block
|
||||||
WORLDEDIT_CUI_WIDTH_SLIM = 1/64 Block
|
WORLDEDIT_CUI_WIDTH_SLIM = 1/64 Block
|
||||||
@@ -101,8 +101,8 @@ NOSCHEMSUBMITTING_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lEinsenden von Sch
|
|||||||
UNNOSCHEMSUBMITTING_ERROR=§cDer Spieler ist nicht vom Einsenden von Schematics ausgeschlossen.
|
UNNOSCHEMSUBMITTING_ERROR=§cDer Spieler ist nicht vom Einsenden von Schematics ausgeschlossen.
|
||||||
UNNOSCHEMSUBMITTING=§e{0} §7darf nun wieder §e§lSchematis§7 einsenden§8.
|
UNNOSCHEMSUBMITTING=§e{0} §7darf nun wieder §e§lSchematis§7 einsenden§8.
|
||||||
|
|
||||||
WORLDEDIT_CUI_SELECTION = Auswahl
|
WORLDEDIT_CUI_SELECTION = Eigene Auswahl
|
||||||
WORLDEDIT_CUI_CLIPBOARD = Kopie
|
WORLDEDIT_CUI_CLIPBOARD = Eigene Kopie
|
||||||
WORLDEDIT_CUI_SELECTION_OTHER = Auswahl Anderer
|
WORLDEDIT_CUI_SELECTION_OTHER = Auswahl Anderer
|
||||||
WORLDEDIT_CUI_CLIPBOARD_OTHER = Kopie Anderer
|
WORLDEDIT_CUI_CLIPBOARD_OTHER = Kopie Anderer
|
||||||
|
|
||||||
|
|||||||
@@ -120,12 +120,16 @@ public class WorldEditRenderer implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||||
renderRegion(event.getPlayer(), we.getSession(event.getPlayer()));
|
Bukkit.getScheduler().runTaskLater(Core.getInstance(), () -> {
|
||||||
|
renderRegion(event.getPlayer(), we.getSession(event.getPlayer()));
|
||||||
|
}, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onBlockBreak(BlockBreakEvent event) {
|
public void onBlockBreak(BlockBreakEvent event) {
|
||||||
renderRegion(event.getPlayer(), we.getSession(event.getPlayer()));
|
Bukkit.getScheduler().runTaskLater(Core.getInstance(), () -> {
|
||||||
|
renderRegion(event.getPlayer(), we.getSession(event.getPlayer()));
|
||||||
|
}, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
|
|||||||
+4
-3
@@ -17,10 +17,9 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.steamwar;
|
package de.steamwar.core;
|
||||||
|
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
import de.steamwar.core.Core;
|
|
||||||
import de.steamwar.inventory.SWInventory;
|
import de.steamwar.inventory.SWInventory;
|
||||||
import de.steamwar.inventory.SWItem;
|
import de.steamwar.inventory.SWItem;
|
||||||
import de.steamwar.sql.UserConfig;
|
import de.steamwar.sql.UserConfig;
|
||||||
@@ -90,7 +89,9 @@ public class WorldEditRendererCUIEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public WorldEditRendererCUIEditor() {
|
public WorldEditRendererCUIEditor() {
|
||||||
new Command();
|
if (Core.getVersion() >= 21) {
|
||||||
|
new Command();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Command extends SWCommand {
|
private static class Command extends SWCommand {
|
||||||
Reference in New Issue
Block a user