forked from SteamWar/SteamWar
Format code
This commit is contained in:
+2
-1
@@ -151,9 +151,10 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
|
|||||||
}
|
}
|
||||||
|
|
||||||
SWInventory swInventory = new SWInventory(player, guiSize, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
|
SWInventory swInventory = new SWInventory(player, guiSize, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
|
||||||
for (int i = guiSize - 9; i < guiSize; i++)
|
for (int i = guiSize - 9; i < guiSize; i++) {
|
||||||
swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7", clickType -> {
|
swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7", clickType -> {
|
||||||
}));
|
}));
|
||||||
|
}
|
||||||
swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).setCustomModelData(CMDs.BACK).getItemStack(), clickType -> back.run());
|
swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).setCustomModelData(CMDs.BACK).getItemStack(), clickType -> back.run());
|
||||||
swInventory.setItem(guiSize - 5, new SWItem(Material.WOODEN_AXE, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_COPY", player)).getItemStack(), clickType -> {
|
swInventory.setItem(guiSize - 5, new SWItem(Material.WOODEN_AXE, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_COPY", player)).getItemStack(), clickType -> {
|
||||||
SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_GUI_COPY_TITLE", player), "1");
|
SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_GUI_COPY_TITLE", player), "1");
|
||||||
|
|||||||
@@ -38,8 +38,9 @@ public class HotbarKit extends Kit {
|
|||||||
public static final HotbarKit SPECTATOR_KIT = new HotbarKit();
|
public static final HotbarKit SPECTATOR_KIT = new HotbarKit();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
for (int i = 0; i < 9; i++)
|
for (int i = 0; i < 9; i++) {
|
||||||
SPECTATOR_KIT.setItem(i, "JOIN_REQUEST", new ItemBuilder(Material.PAPER).build(), GUI::joinRequest);
|
SPECTATOR_KIT.setItem(i, "JOIN_REQUEST", new ItemBuilder(Material.PAPER).build(), GUI::joinRequest);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static final int HOTBAR_SIZE = 9;
|
protected static final int HOTBAR_SIZE = 9;
|
||||||
|
|||||||
+2
-1
@@ -166,8 +166,9 @@ public class PacketProcessor implements Listener {
|
|||||||
task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::process, 1, 1);
|
task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::process, 1, 1);
|
||||||
|
|
||||||
Bukkit.getPluginManager().registerEvents(this, FightSystem.getPlugin());
|
Bukkit.getPluginManager().registerEvents(this, FightSystem.getPlugin());
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
entityServer.addPlayer(player);
|
entityServer.addPlayer(player);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addREntity(int entityId, REntity entity) {
|
private void addREntity(int entityId, REntity entity) {
|
||||||
|
|||||||
@@ -118,10 +118,12 @@ public class FightStatistics {
|
|||||||
int fightId = create(gameMode, Config.world.getName(), starttime, remainingTime,
|
int fightId = create(gameMode, Config.world.getName(), starttime, remainingTime,
|
||||||
blueLeader, redLeader, blueSchem, redSchem, win, windescription);
|
blueLeader, redLeader, blueSchem, redSchem, win, windescription);
|
||||||
|
|
||||||
for (FightPlayer fp : Fight.getBlueTeam().getPlayers())
|
for (FightPlayer fp : Fight.getBlueTeam().getPlayers()) {
|
||||||
savePlayerStats(fp, fightId);
|
savePlayerStats(fp, fightId);
|
||||||
for (FightPlayer fp : Fight.getRedTeam().getPlayers())
|
}
|
||||||
|
for (FightPlayer fp : Fight.getRedTeam().getPlayers()) {
|
||||||
savePlayerStats(fp, fightId);
|
savePlayerStats(fp, fightId);
|
||||||
|
}
|
||||||
|
|
||||||
if (ArenaMode.Event.contains(Config.mode)) {
|
if (ArenaMode.Event.contains(Config.mode)) {
|
||||||
Config.EventKampf.setFight(fightId);
|
Config.EventKampf.setFight(fightId);
|
||||||
|
|||||||
@@ -71,8 +71,9 @@ public class Hull {
|
|||||||
.filter(v -> v.sqLength() == 1 || v.x * primaryDirection.x + v.y * primaryDirection.y + v.z * primaryDirection.z == 1) // Not pointing away from primary direction
|
.filter(v -> v.sqLength() == 1 || v.x * primaryDirection.x + v.y * primaryDirection.y + v.z * primaryDirection.z == 1) // Not pointing away from primary direction
|
||||||
.toArray(IntVector[]::new);
|
.toArray(IntVector[]::new);
|
||||||
|
|
||||||
for (IntVector direction : directions)
|
for (IntVector direction : directions) {
|
||||||
visibilityDirections.put(direction, new BitSet(region.volume()));
|
visibilityDirections.put(direction, new BitSet(region.volume()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) {
|
public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) {
|
||||||
@@ -89,15 +90,17 @@ public class Hull {
|
|||||||
|
|
||||||
public void addPlayer(Player player) {
|
public void addPlayer(Player player) {
|
||||||
if (players.add(player)) {
|
if (players.add(player)) {
|
||||||
for (Entity entity : entities)
|
for (Entity entity : entities) {
|
||||||
BlockIdWrapper.impl.untrackEntity(player, entity);
|
BlockIdWrapper.impl.untrackEntity(player, entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removePlayer(Player player, boolean activeRemoval) {
|
public void removePlayer(Player player, boolean activeRemoval) {
|
||||||
if (players.remove(player) && activeRemoval) {
|
if (players.remove(player) && activeRemoval) {
|
||||||
for (Entity entity : entities)
|
for (Entity entity : entities) {
|
||||||
BlockIdWrapper.impl.trackEntity(player, entity);
|
BlockIdWrapper.impl.trackEntity(player, entity);
|
||||||
|
}
|
||||||
// techhider triggers block change sending
|
// techhider triggers block change sending
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -106,13 +109,15 @@ public class Hull {
|
|||||||
Location location = entity.getLocation();
|
Location location = entity.getLocation();
|
||||||
if (region.inRegion(location) && !visibility.get(new IntVector(location).toId(region))) {
|
if (region.inRegion(location) && !visibility.get(new IntVector(location).toId(region))) {
|
||||||
if (entities.add(entity)) {
|
if (entities.add(entity)) {
|
||||||
for (Player player : players)
|
for (Player player : players) {
|
||||||
BlockIdWrapper.impl.untrackEntity(player, entity);
|
BlockIdWrapper.impl.untrackEntity(player, entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (entities.remove(entity)) {
|
if (entities.remove(entity)) {
|
||||||
for (Player player : players)
|
for (Player player : players) {
|
||||||
BlockIdWrapper.impl.trackEntity(player, entity);
|
BlockIdWrapper.impl.trackEntity(player, entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -138,8 +143,9 @@ public class Hull {
|
|||||||
visibility.clear();
|
visibility.clear();
|
||||||
occluding.clear();
|
occluding.clear();
|
||||||
uncoveredSurface.clear();
|
uncoveredSurface.clear();
|
||||||
for (BitSet directionalVisibility : visibilityDirections.values())
|
for (BitSet directionalVisibility : visibilityDirections.values()) {
|
||||||
directionalVisibility.clear();
|
directionalVisibility.clear();
|
||||||
|
}
|
||||||
|
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
region.forEach((x, y, z) -> {
|
region.forEach((x, y, z) -> {
|
||||||
@@ -239,8 +245,9 @@ public class Hull {
|
|||||||
if (occluding.get(id)) return;
|
if (occluding.get(id)) return;
|
||||||
|
|
||||||
uncoverBlocks(uncovered, block.add(direction), direction, directionalVisibility, branchDirections);
|
uncoverBlocks(uncovered, block.add(direction), direction, directionalVisibility, branchDirections);
|
||||||
for (IntVector branchDirection : branchDirections)
|
for (IntVector branchDirection : branchDirections) {
|
||||||
uncoverBlocks(uncovered, block.add(branchDirection), branchDirection, visibilityDirections.get(branchDirection), NO_BRANCHES);
|
uncoverBlocks(uncovered, block.add(branchDirection), branchDirection, visibilityDirections.get(branchDirection), NO_BRANCHES);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -130,8 +130,9 @@ public class HullHider implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void removePlayer(Player player, boolean activeRemoval) {
|
private void removePlayer(Player player, boolean activeRemoval) {
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.removePlayer(player, activeRemoval);
|
hull.removePlayer(player, activeRemoval);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -174,34 +175,40 @@ public class HullHider implements Listener {
|
|||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onSpawn(EntitySpawnEvent e) {
|
public void onSpawn(EntitySpawnEvent e) {
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.checkEntity(e.getEntity());
|
hull.checkEntity(e.getEntity());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onTick() {
|
private void onTick() {
|
||||||
Recording.iterateOverEntities(Objects::nonNull, entity -> {
|
Recording.iterateOverEntities(Objects::nonNull, entity -> {
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.checkEntity(entity);
|
hull.checkEntity(entity);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.sendUncoveredBlocks();
|
hull.sendUncoveredBlocks();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onDeath(EntityDeathEvent e) {
|
public void onDeath(EntityDeathEvent e) {
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.removeEntity(e.getEntity());
|
hull.removeEntity(e.getEntity());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateREntity(REntity e) {
|
public void updateREntity(REntity e) {
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.checkREntity(e);
|
hull.checkREntity(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void despawnREntity(REntity e) {
|
public void despawnREntity(REntity e) {
|
||||||
for (Hull hull : hulls)
|
for (Hull hull : hulls) {
|
||||||
hull.removeREntity(e);
|
hull.removeREntity(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -98,9 +98,11 @@ public class Region {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void forEachChunk(ObjIntConsumer<Integer> executor) {
|
public void forEachChunk(ObjIntConsumer<Integer> executor) {
|
||||||
for (int x = getMinChunkX(); x <= getMaxChunkX(); x++)
|
for (int x = getMinChunkX(); x <= getMaxChunkX(); x++) {
|
||||||
for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++)
|
for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++) {
|
||||||
executor.accept(x, z);
|
executor.accept(x, z);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEach(TriConsumer<Integer, Integer, Integer> executor) {
|
public void forEach(TriConsumer<Integer, Integer, Integer> executor) {
|
||||||
|
|||||||
@@ -60,9 +60,11 @@ public class FightWorld {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void forEachChunk(ObjIntConsumer<Integer> executor) {
|
private static void forEachChunk(ObjIntConsumer<Integer> executor) {
|
||||||
for (int x = getMinChunkX(); x <= getMaxChunkX(); x++)
|
for (int x = getMinChunkX(); x <= getMaxChunkX(); x++) {
|
||||||
for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++)
|
for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++) {
|
||||||
executor.accept(x, z);
|
executor.accept(x, z);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void resetWorld() {
|
public static void resetWorld() {
|
||||||
|
|||||||
@@ -87,8 +87,9 @@ public abstract class SpecialItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static boolean handleUse(ItemStack item, Player player, List<SpecialItem> items) {
|
private static boolean handleUse(ItemStack item, Player player, List<SpecialItem> items) {
|
||||||
for (SpecialItem specialItem : items)
|
for (SpecialItem specialItem : items) {
|
||||||
if (item.isSimilar(specialItem.getItem())) return specialItem.handleUse(player);
|
if (item.isSimilar(specialItem.getItem())) return specialItem.handleUse(player);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,8 +43,9 @@ public class Realtime extends JavaPlugin implements Listener {
|
|||||||
Date date = new Date();
|
Date date = new Date();
|
||||||
long time = date.getHours() * 1000 + (long) (date.getMinutes() * 16.66666666666667) + (long) (date.getSeconds() * 0.1666666666666667) - 6000;
|
long time = date.getHours() * 1000 + (long) (date.getMinutes() * 16.66666666666667) + (long) (date.getSeconds() * 0.1666666666666667) - 6000;
|
||||||
|
|
||||||
for (World world : Bukkit.getWorlds())
|
for (World world : Bukkit.getWorlds()) {
|
||||||
world.setTime(time);
|
world.setTime(time);
|
||||||
|
}
|
||||||
}, 0, 600);
|
}, 0, 600);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,32 +132,38 @@ public class Message {
|
|||||||
/* Send message to all players */
|
/* Send message to all players */
|
||||||
|
|
||||||
public void broadcastPrefixless(String message, String onHover, ClickEvent onClick, Object... params) {
|
public void broadcastPrefixless(String message, String onHover, ClickEvent onClick, Object... params) {
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
sendPrefixless(message, player, parse(onHover, false, player), onClick, params);
|
sendPrefixless(message, player, parse(onHover, false, player), onClick, params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastPrefixless(String message, Object... params) {
|
public void broadcastPrefixless(String message, Object... params) {
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
sendPrefixless(message, player, ChatMessageType.SYSTEM, params);
|
sendPrefixless(message, player, ChatMessageType.SYSTEM, params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastActionbar(String message, Object... params) {
|
public void broadcastActionbar(String message, Object... params) {
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
send(message, player, ChatMessageType.ACTION_BAR, params);
|
send(message, player, ChatMessageType.ACTION_BAR, params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcast(String message, String onHover, ClickEvent onClick, Object... params) {
|
public void broadcast(String message, String onHover, ClickEvent onClick, Object... params) {
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
send(message, player, parse(onHover, false, player), onClick, params);
|
send(message, player, parse(onHover, false, player), onClick, params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcast(String message, Object... params) {
|
public void broadcast(String message, Object... params) {
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
send(message, player, ChatMessageType.SYSTEM, params);
|
send(message, player, ChatMessageType.SYSTEM, params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void chat(String message, Object... params) {
|
public void chat(String message, Object... params) {
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
sendPrefixless(message, player, ChatMessageType.CHAT, params);
|
sendPrefixless(message, player, ChatMessageType.CHAT, params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,11 +57,13 @@ public class SQLWrapperImpl implements SQLWrapper<Material> {
|
|||||||
@Override
|
@Override
|
||||||
public void additionalExceptionMetadata(StringBuilder builder) {
|
public void additionalExceptionMetadata(StringBuilder builder) {
|
||||||
builder.append("\nPlayers: ");
|
builder.append("\nPlayers: ");
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
builder.append(player.getName()).append(" ");
|
builder.append(player.getName()).append(" ");
|
||||||
|
}
|
||||||
builder.append("\nWorlds: ");
|
builder.append("\nWorlds: ");
|
||||||
for (World world : Bukkit.getWorlds())
|
for (World world : Bukkit.getWorlds()) {
|
||||||
builder.append(world.getName()).append(" ");
|
builder.append(world.getName()).append(" ");
|
||||||
|
}
|
||||||
builder.append("\nServer: ").append(SERVER_VERSION);
|
builder.append("\nServer: ").append(SERVER_VERSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -234,8 +234,9 @@ public class ChunkHider {
|
|||||||
|
|
||||||
public void skipPalette() {
|
public void skipPalette() {
|
||||||
int paletteLength = copyVarInt();
|
int paletteLength = copyVarInt();
|
||||||
for (int i = 0; i < paletteLength; i++)
|
for (int i = 0; i < paletteLength; i++) {
|
||||||
copyVarInt();
|
copyVarInt();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void processPalette() {
|
public void processPalette() {
|
||||||
@@ -285,8 +286,9 @@ public class ChunkHider {
|
|||||||
|
|
||||||
public long[] readDataArray() {
|
public long[] readDataArray() {
|
||||||
long[] array = new long[copyVarInt()];
|
long[] array = new long[copyVarInt()];
|
||||||
for (int i = 0; i < array.length; i++)
|
for (int i = 0; i < array.length; i++) {
|
||||||
array[i] = in.readLong();
|
array[i] = in.readLong();
|
||||||
|
}
|
||||||
|
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
@@ -299,15 +301,17 @@ public class ChunkHider {
|
|||||||
char valuesPerLong = (char) (64 / bitsPerBlock);
|
char valuesPerLong = (char) (64 / bitsPerBlock);
|
||||||
int i1 = (entries + valuesPerLong - 1) / valuesPerLong;
|
int i1 = (entries + valuesPerLong - 1) / valuesPerLong;
|
||||||
long[] array = new long[i1];
|
long[] array = new long[i1];
|
||||||
for (int i = 0; i < i1; i++)
|
for (int i = 0; i < i1; i++) {
|
||||||
array[i] = in.readLong();
|
array[i] = in.readLong();
|
||||||
|
}
|
||||||
|
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeDataArray(long[] array) {
|
public void writeDataArray(long[] array) {
|
||||||
for (long l : array)
|
for (long l : array) {
|
||||||
out.writeLong(l);
|
out.writeLong(l);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,8 +42,9 @@ public class ProtocolUtils {
|
|||||||
int length = Array.getLength(array);
|
int length = Array.getLength(array);
|
||||||
Object result = Array.newInstance(elementClass, length);
|
Object result = Array.newInstance(elementClass, length);
|
||||||
|
|
||||||
for (int i = 0; i < length; i++)
|
for (int i = 0; i < length; i++) {
|
||||||
Array.set(result, i, worker.apply(Array.get(array, i)));
|
Array.set(result, i, worker.apply(Array.get(array, i)));
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -72,8 +72,9 @@ public class ProtocolWrapper {
|
|||||||
if (blocks.isEmpty()) return null;
|
if (blocks.isEmpty()) return null;
|
||||||
|
|
||||||
short[] newPos = new short[poss.size()];
|
short[] newPos = new short[poss.size()];
|
||||||
for (int i = 0; i < newPos.length; i++)
|
for (int i = 0; i < newPos.length; i++) {
|
||||||
newPos[i] = poss.get(i);
|
newPos[i] = poss.get(i);
|
||||||
|
}
|
||||||
|
|
||||||
multiBlockChangePos.set(packet, newPos);
|
multiBlockChangePos.set(packet, newPos);
|
||||||
multiBlockChangeBlocks.set(packet, blocks.toArray(new BlockState[0]));
|
multiBlockChangeBlocks.set(packet, blocks.toArray(new BlockState[0]));
|
||||||
|
|||||||
@@ -172,9 +172,11 @@ public class TowerRunGame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void forEachChunk(ObjIntConsumer<Integer> executor) {
|
private static void forEachChunk(ObjIntConsumer<Integer> executor) {
|
||||||
for (int x = getMinChunkX(); x <= getMaxChunkX(); x++)
|
for (int x = getMinChunkX(); x <= getMaxChunkX(); x++) {
|
||||||
for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++)
|
for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++) {
|
||||||
executor.accept(x, z);
|
executor.accept(x, z);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void resetWorld() {
|
private static void resetWorld() {
|
||||||
|
|||||||
@@ -170,11 +170,13 @@ public class Subserver {
|
|||||||
private void fatalError(Exception e) {
|
private void fatalError(Exception e) {
|
||||||
logger.log(Level.SEVERE, e, () -> serverName + " did not run correctly!");
|
logger.log(Level.SEVERE, e, () -> serverName + " did not run correctly!");
|
||||||
|
|
||||||
for (Player cached : cachedPlayers)
|
for (Player cached : cachedPlayers) {
|
||||||
cached.sendMessage(PREFIX.append(Component.text("Unexpected error during server startup.").color(NamedTextColor.RED)));
|
cached.sendMessage(PREFIX.append(Component.text("Unexpected error during server startup.").color(NamedTextColor.RED)));
|
||||||
|
}
|
||||||
if (registeredServer != null) {
|
if (registeredServer != null) {
|
||||||
for (Player player : registeredServer.getPlayersConnected())
|
for (Player player : registeredServer.getPlayersConnected()) {
|
||||||
player.sendMessage(PREFIX.append(Component.text("Lost connection to server.").color(NamedTextColor.RED)));
|
player.sendMessage(PREFIX.append(Component.text("Lost connection to server.").color(NamedTextColor.RED)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -264,7 +266,8 @@ public class Subserver {
|
|||||||
|
|
||||||
private void sendProgress(int progress) {
|
private void sendProgress(int progress) {
|
||||||
Component tc = generateBar(progress);
|
Component tc = generateBar(progress);
|
||||||
for (Player cached : cachedPlayers)
|
for (Player cached : cachedPlayers) {
|
||||||
cached.sendActionBar(tc);
|
cached.sendActionBar(tc);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,8 +47,9 @@ public class ChatterGroup extends Chatter.PlayerlessChatter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) {
|
public void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) {
|
||||||
for (Chatter sender : chatters)
|
for (Chatter sender : chatters) {
|
||||||
sender.send(prefixed, onHover, onClick, message);
|
sender.send(prefixed, onHover, onClick, message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -178,8 +178,9 @@ public class ServerStarter {
|
|||||||
startCondition = () -> {
|
startCondition = () -> {
|
||||||
Bauserver subserver = Bauserver.get(owner);
|
Bauserver subserver = Bauserver.get(owner);
|
||||||
if (subserver != null) {
|
if (subserver != null) {
|
||||||
for (Player p : playersToSend)
|
for (Player p : playersToSend) {
|
||||||
SubserverSystem.sendPlayer(subserver, p);
|
SubserverSystem.sendPlayer(subserver, p);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
boolean atLeastOneSupervisor = playersToSend.stream().anyMatch(player -> {
|
boolean atLeastOneSupervisor = playersToSend.stream().anyMatch(player -> {
|
||||||
@@ -236,8 +237,9 @@ public class ServerStarter {
|
|||||||
startCondition = () -> {
|
startCondition = () -> {
|
||||||
Builderserver subserver = Builderserver.get(worldName);
|
Builderserver subserver = Builderserver.get(worldName);
|
||||||
if (subserver != null) {
|
if (subserver != null) {
|
||||||
for (Player p : playersToSend)
|
for (Player p : playersToSend) {
|
||||||
SubserverSystem.sendPlayer(subserver, p);
|
SubserverSystem.sendPlayer(subserver, p);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@@ -328,8 +330,9 @@ public class ServerStarter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void postStart(Subserver subserver) {
|
private void postStart(Subserver subserver) {
|
||||||
for (Player p : playersToSend)
|
for (Player p : playersToSend) {
|
||||||
SubserverSystem.sendPlayer(subserver, p);
|
SubserverSystem.sendPlayer(subserver, p);
|
||||||
|
}
|
||||||
|
|
||||||
callback.accept(subserver);
|
callback.accept(subserver);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,8 +92,9 @@ public enum ServerVersion {
|
|||||||
private static final Map<Integer, ServerVersion> versionMap = new HashMap<>();
|
private static final Map<Integer, ServerVersion> versionMap = new HashMap<>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
for (ServerVersion version : values())
|
for (ServerVersion version : values()) {
|
||||||
versionMap.put(version.getVersionSuffix(), version);
|
versionMap.put(version.getVersionSuffix(), version);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ServerVersion get(int version) {
|
public static ServerVersion get(int version) {
|
||||||
|
|||||||
@@ -241,8 +241,9 @@ public class CheckCommand extends SWCommand {
|
|||||||
currentCheckers.put(checker.user().getUUID(), this);
|
currentCheckers.put(checker.user().getUUID(), this);
|
||||||
currentSchems.put(schematic.getId(), this);
|
currentSchems.put(schematic.getId(), this);
|
||||||
|
|
||||||
for (CheckedSchematic previous : CheckedSchematic.previousChecks(schematic))
|
for (CheckedSchematic previous : CheckedSchematic.previousChecks(schematic)) {
|
||||||
checker.prefixless("CHECK_SCHEMATIC_PREVIOUS", previous.getEndTime(), SteamwarUser.byId(previous.getValidator()).getUserName(), previous.getDeclineReason());
|
checker.prefixless("CHECK_SCHEMATIC_PREVIOUS", previous.getEndTime(), SteamwarUser.byId(previous.getValidator()).getUserName(), previous.getDeclineReason());
|
||||||
|
}
|
||||||
next();
|
next();
|
||||||
}).start();
|
}).start();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,8 @@ public class RulesCommand extends SWCommand {
|
|||||||
public void genericCommand(Chatter sender) {
|
public void genericCommand(Chatter sender) {
|
||||||
sender.system("REGELN_RULES");
|
sender.system("REGELN_RULES");
|
||||||
|
|
||||||
for (String ruleset : Arrays.asList("REGELN_AS", "REGELN_MWG", "REGELN_WG", "REGELN_WS", "REGELN_QG", "REGELN_CONDUCT"))
|
for (String ruleset : Arrays.asList("REGELN_AS", "REGELN_MWG", "REGELN_WG", "REGELN_WS", "REGELN_QG", "REGELN_CONDUCT")) {
|
||||||
sender.prefixless(ruleset, new Message("URL_FORMAT", sender.parseToPlain(ruleset + "_URL")), ClickEvent.openUrl(sender.parseToPlain(ruleset + "_URL")));
|
sender.prefixless(ruleset, new Message("URL_FORMAT", sender.parseToPlain(ruleset + "_URL")), ClickEvent.openUrl(sender.parseToPlain(ruleset + "_URL")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,8 +72,9 @@ public class TeamCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void helpMessages(Chatter sender, String... messages) {
|
private void helpMessages(Chatter sender, String... messages) {
|
||||||
for (String message : messages)
|
for (String message : messages) {
|
||||||
sender.system(message);
|
sender.system(message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register(value = "create", description = "TEAM_CREATE_USAGE")
|
@Register(value = "create", description = "TEAM_CREATE_USAGE")
|
||||||
@@ -392,8 +393,9 @@ public class TeamCommand extends SWCommand {
|
|||||||
if (!events.isEmpty()) {
|
if (!events.isEmpty()) {
|
||||||
sender.system("TEAM_EVENT_HEADER");
|
sender.system("TEAM_EVENT_HEADER");
|
||||||
DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_DATE_FORMAT"));
|
DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_DATE_FORMAT"));
|
||||||
for (Event e : events)
|
for (Event e : events) {
|
||||||
sender.prefixless("TEAM_EVENT_EVENT", e.getStart().toLocalDateTime().format(dateFormat), e.getEventName());
|
sender.prefixless("TEAM_EVENT_EVENT", e.getStart().toLocalDateTime().format(dateFormat), e.getEventName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -395,8 +395,10 @@ public class PluginMessage extends BasicListener {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
for (String channel : Arrays.asList("bedrockify:cauldron_particles", "bedrockify:eat-particles")) //https://github.com/juancarloscp52/BedrockIfy (Bedrock features on Java, banned for reach-around block placement)
|
for (String channel : Arrays.asList("bedrockify:cauldron_particles", "bedrockify:eat-particles")) {
|
||||||
|
//https://github.com/juancarloscp52/BedrockIfy (Bedrock features on Java, banned for reach-around block placement)
|
||||||
channelRegisterHandlers.put(channel, player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "bedrockify"));
|
channelRegisterHandlers.put(channel, player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "bedrockify"));
|
||||||
|
}
|
||||||
|
|
||||||
registerBiDirPassthrough("WECUI", "worldedit:cui", "worldedit:internal", "minecraft:wecui");
|
registerBiDirPassthrough("WECUI", "worldedit:cui", "worldedit:internal", "minecraft:wecui");
|
||||||
|
|
||||||
@@ -534,8 +536,9 @@ public class PluginMessage extends BasicListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void registerPassthroughToServer(String... channels) {
|
private void registerPassthroughToServer(String... channels) {
|
||||||
for (String channel : channels)
|
for (String channel : channels) {
|
||||||
register(channel, false, directional(UNKNOWN, PASS_THROUGH));
|
register(channel, false, directional(UNKNOWN, PASS_THROUGH));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void registerBiDirPassthrough(String... channels) {
|
private void registerBiDirPassthrough(String... channels) {
|
||||||
|
|||||||
@@ -48,7 +48,8 @@ public class Controlify {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onRegister(Player player) {
|
public void onRegister(Player player) {
|
||||||
for (byte[] packet : packets)
|
for (byte[] packet : packets) {
|
||||||
player.sendPluginMessage(MinecraftChannelIdentifier.from(CHANNEL), packet);
|
player.sendPluginMessage(MinecraftChannelIdentifier.from(CHANNEL), packet);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user