|
|
@@ -10,17 +10,14 @@ command.add("removeinvstats");
|
|
|
command.add("sfstats");
|
|
|
command.add("topsfstats");
|
|
|
command.add("removesfstats");
|
|
|
-//Sonstige
|
|
|
-command.add("mayo");
|
|
|
//Vanilla überschreiben
|
|
|
command.add("help");
|
|
|
command.add("butcher");
|
|
|
-command.add("locate");
|
|
|
|
|
|
alias_map = map.new();
|
|
|
command_list = list.new();
|
|
|
command_map = map.new();
|
|
|
-command.register("afk", "Toggles afk state");
|
|
|
+command.register("afk", "Toggles afk");
|
|
|
command.register("allsounds", "Plays all sounds");
|
|
|
command.register("answer", "Answers the last private message");
|
|
|
command.register("ass", "Armor Stand Signs");
|
|
|
@@ -34,7 +31,6 @@ command.register("coords", "Shows infos for the targeted block");
|
|
|
command.register("copyisland", "Copyisland-Commands");
|
|
|
command.register("databank", "Databank-Commands");
|
|
|
command.register("datatools", "Datatools-Commands");
|
|
|
-command.register("door", "Toggles automatic door-closing");
|
|
|
command.register("enderchest", "Shows enderchests");
|
|
|
command.register("error", "Error-Logger");
|
|
|
command.register("errordebug", "Debug-Logger");
|
|
|
@@ -70,7 +66,6 @@ command.register("nickname", "Set a nickname");
|
|
|
command.register("nowb", "Sends no 'is back' message if afk");
|
|
|
command.register("party", "Party-Commands");
|
|
|
command.register("perm", "Manage permissions");
|
|
|
-command.register("permtoggle", "Toggles to user-permissions");
|
|
|
command.register("plant", "Plant seeds");
|
|
|
command.register("playtime", "Shows your playtime");
|
|
|
command.register("plot", "Plot-Commands");
|
|
|
@@ -84,10 +79,9 @@ command.register("script", "Script-Commands");
|
|
|
command.register("seen", "Returns the last date the player was online");
|
|
|
command.register("senditem", "Sends an itemstack to another player");
|
|
|
command.register("setrank", "");
|
|
|
-command.register("setservermessage", "Setzt die Server-Message in der Multiplayer Serverliste");
|
|
|
-command.register("setspawn", "Setzt den Spawn des angegebenen Modis");
|
|
|
+command.register("setservermessage", "Sets the server-message in the serverlist");
|
|
|
+command.register("setspawn", "Changes a spawn");
|
|
|
command.register("shop", "Shop-Commands");
|
|
|
-command.register("showcoords", "Toggled die Koordinatenanzeige");
|
|
|
command.register("sign", "Bearbeitet ein Schild");
|
|
|
command.register("silentban", "Bannt einen Spieler ohne Meldung im Chat");
|
|
|
command.register("silentjoin", "Toggled Silentjoins");
|
|
|
@@ -109,7 +103,6 @@ command.register("tpahere", "Sendet eine Teleportanfrage an einen Spieler");
|
|
|
command.register("tpaccept", "Akzeptiert eine Teleportanfrage");
|
|
|
command.register("tpaccepthere", "Akzeptiert eine Teleportanfrage");
|
|
|
command.register("tppos", "Teleport zu Koordinaten");
|
|
|
-command.register("tptoggle", "Toggled den Erhalt von Teleportanfragen");
|
|
|
command.register("unban", "Entbannt einen Spieler");
|
|
|
command.register("unjail", "Lässt einen Spieler aus dem Gefängnis frei");
|
|
|
command.register("unmute", "Unmutes a player");
|
|
|
@@ -149,6 +142,7 @@ command.registerAlias("hub", "leave");
|
|
|
command.registerAlias("fuckit", "giveup");
|
|
|
command.registerAlias("ram", "memory");
|
|
|
|
|
|
+sign_tag = block.getTag("minecraft:signs");
|
|
|
crops_tag = block.getTag("minecraft:crops");
|
|
|
dirt_tag = block.getTag("forge:dirt");
|
|
|
gamesspawn = world.getGamesSpawn();
|
|
|
@@ -370,6 +364,8 @@ coords_loop_active = false;
|
|
|
afk_loop_active = false;
|
|
|
|
|
|
event.load("inv_click");
|
|
|
+event.load("inv_close");
|
|
|
+event.load("function_key");
|
|
|
event.load("missing_perm");
|
|
|
event.load("missing_command");
|
|
|
event.load("custom_command");
|
|
|
@@ -518,23 +514,54 @@ if(event == "missing_perm") {
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(event == "inv_click") {
|
|
|
- if(!set.contains(invseeids, inv_id)) {
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- //On inv_click in an invsee inventory
|
|
|
- text.split(split_list, " ", inv_name);
|
|
|
- p_name = list.getIndex(split_list, 2);
|
|
|
- p = read.player(p_name);
|
|
|
- if(p == null) {
|
|
|
- inv.close(player);
|
|
|
- msg.prefix(sender_name, prefix_commands, "This player is no longer online. Use /inv load <player> and /inv save <player> to overwrite an offline player's inventory.");
|
|
|
- goto("wait");
|
|
|
+ //inv see
|
|
|
+ if(set.contains(invseeids, inv_id)) {
|
|
|
+ //On inv_click in an invsee inventory
|
|
|
+ text.split(split_list, " ", inv_name);
|
|
|
+ p_name = list.getIndex(split_list, 2);
|
|
|
+ p = read.player(p_name);
|
|
|
+ if(p == null) {
|
|
|
+ inv.close(player);
|
|
|
+ msg.prefix(sender_name, prefix_commands, "This player is no longer online. Use /inv load <player> and /inv save <player> to overwrite an offline player's inventory.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ //Transmit item
|
|
|
+ player.removeItem(p, item);
|
|
|
+ safeGiveItemPlayer(player, item);
|
|
|
+ inv.setItem(inv, inv_slot, read.item("minecraft:air"));
|
|
|
+ inv.update(player);
|
|
|
+ }
|
|
|
+ //settings
|
|
|
+ if(inv_name == "§8Settings") {
|
|
|
+ if(inv_slot == 0) {
|
|
|
+ new_value = !player.getAutoCloseDoor(player);
|
|
|
+ player.setAutoCloseDoor(player, new_value);
|
|
|
+ inv.setItem(inv, inv_slot, read.item("minecraft:oak_door", 1, "§fAuto Door-Close", new_value));
|
|
|
+ }
|
|
|
+ elseif(inv_slot == 1) {
|
|
|
+ new_value = !player.doesAcceptTpaRequests(player);
|
|
|
+ player.acceptTpaRequests(player, new_value);
|
|
|
+ inv.setItem(inv, inv_slot, read.item("minecraft:ender_pearl", 1, "§fAccept TPA-Requests", new_value));
|
|
|
+ }
|
|
|
+ elseif(inv_slot == 2) {
|
|
|
+ new_value = !showCoords.get(player);
|
|
|
+ showCoords.set(player, new_value);
|
|
|
+ inv.setItem(inv, inv_slot, read.item("minecraft:compass", 1, "§fShow Coords", new_value));
|
|
|
+ if(new_value) {
|
|
|
+ if(!coords_loop_active) {
|
|
|
+ sgoto(30, "coordsloop");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ display.remove(player, 30);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ elseif(inv_slot == 3) {
|
|
|
+ new_value = !player.hasSittingActivated(player);
|
|
|
+ player.activateSitting(player, new_value);
|
|
|
+ inv.setItem(inv, inv_slot, read.item("minecraft:oak_stairs", 1, "§fStair-Sitting", new_value));
|
|
|
+ }
|
|
|
+ inv.update(player);
|
|
|
}
|
|
|
- //Transmit item
|
|
|
- player.removeItem(p, item);
|
|
|
- safeGiveItemPlayer(player, item);
|
|
|
- inv.setItem(inv, inv_slot, read.item("minecraft:air"));
|
|
|
- inv.update(player);
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(event == "inv_close") {
|
|
|
@@ -543,6 +570,17 @@ if(event == "inv_close") {
|
|
|
}
|
|
|
goto("wait");
|
|
|
}
|
|
|
+if(event == "function_key") {
|
|
|
+ if(key == 1) {
|
|
|
+ inv = inv.new("333333333");
|
|
|
+ inv.setItem(inv, 0, read.item("minecraft:oak_door", 1, "§fAuto Door-Close", player.getAutoCloseDoor(player)));
|
|
|
+ inv.setItem(inv, 1, read.item("minecraft:ender_pearl", 1, "§fAccept TPA-Requests", player.doesAcceptTpaRequests(player)));
|
|
|
+ inv.setItem(inv, 2, read.item("minecraft:compass", 1, "§fShow Coords", showCoords.get(player)));
|
|
|
+ inv.setItem(inv, 3, read.item("minecraft:oak_stairs", 1, "§fStair-Sitting", player.hasSittingActivated(player)));
|
|
|
+ inv.open(inv, player, "§8Settings");
|
|
|
+ }
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
goto("wait");
|
|
|
|
|
|
@vanish
|
|
|
@@ -964,6 +1002,7 @@ if(size < 1) {
|
|
|
msg.prefix(player, "§cErrorDebugs", "§r/errordebug ...");
|
|
|
msg(player, "§c - list §rLists all errordebugs");
|
|
|
msg(player, "§c - clear §rDeletes all errordebugs");
|
|
|
+ msg(player, "§c - toggle §rToggles errordebugs");
|
|
|
goto("wait");
|
|
|
}
|
|
|
arg0 = list.getIndex(args, 0);
|
|
|
@@ -983,12 +1022,22 @@ if(arg0 == "clear") {
|
|
|
msg.prefix(player, "§cErrorDebugs", "All errordebugs deleted.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
+if(arg0 == "toggle") {
|
|
|
+ new_value = !perm.has(player, "script.debug");
|
|
|
+ player.showDebug(player, new_value);
|
|
|
+ if(new_value) {
|
|
|
+ msg.prefix(player, prefix_commands, "Debug messages are now shown.");
|
|
|
+ } else {
|
|
|
+ msg.prefix(player, prefix_commands, "Debug messages are now hidden.");
|
|
|
+ }
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
goto("wait");
|
|
|
|
|
|
@hat
|
|
|
item = entity.getEquip(player, "hand");
|
|
|
if(item.getType(item) == "minecraft:air") {
|
|
|
- msg.prefix(player, prefix_commands, "§rYou haveto hold an item in hand");
|
|
|
+ msg.prefix(player, prefix_commands, "You have to hold an item in hand.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
entity.setEquip(player, "head", item);
|
|
|
@@ -1246,7 +1295,7 @@ if(isAfk(player)) {
|
|
|
setAfk(player, true);
|
|
|
player.setDisplayName(player, concat("§7§m", nickname));
|
|
|
}
|
|
|
-if(!coords_loop_active) {
|
|
|
+if(!afk_loop_active) {
|
|
|
sgoto(30, "afk_loop");
|
|
|
}
|
|
|
goto("wait");
|
|
|
@@ -1262,20 +1311,6 @@ if(silentjoin) {
|
|
|
}
|
|
|
goto("wait");
|
|
|
|
|
|
-@showcoords
|
|
|
-if(showCoords.get(player)) {
|
|
|
- showCoords.set(player, false);
|
|
|
- msg.prefix(player, prefix_commands, "Coords deactivated.");
|
|
|
- display.remove(player, 30);
|
|
|
-} else {
|
|
|
- showCoords.set(player, true);
|
|
|
- msg.prefix(player, prefix_commands, "Coords activated.");
|
|
|
-}
|
|
|
-if(!coords_loop_active) {
|
|
|
- sgoto(30, "coordsloop");
|
|
|
-}
|
|
|
-goto("wait");
|
|
|
-
|
|
|
@jailloop
|
|
|
size = list.getSize(jailed_list);
|
|
|
for(i = 0; i < size; i++) {
|
|
|
@@ -1295,7 +1330,7 @@ list = players.toList();
|
|
|
size = list.getSize(list);
|
|
|
for(i = 0; i < size; i++) {
|
|
|
p = list.getIndex(list, i);
|
|
|
- if(showcoords.get(player)) {
|
|
|
+ if(showcoords.get(p)) {
|
|
|
p_loc = entity.getLocation(p);
|
|
|
display.add(p, 30, concat("§6Koords: §r", text.number(loc.getCoord(p_loc, "bx")), " / ", text.number(loc.getCoord(p_loc, "by")), " / ", text.number(loc.getCoord(p_loc, "bz"))));
|
|
|
}
|
|
|
@@ -1456,29 +1491,33 @@ text = text.replace(text, "\"","\\\"");
|
|
|
msg(player, text.clipBoard(text, text));
|
|
|
goto("wait");
|
|
|
|
|
|
-@permtoggle
|
|
|
-player_id = player.getId(player);
|
|
|
-if(perm.has(player, "pseudoPerm")) {
|
|
|
- reloadAllPerms(player_id);
|
|
|
- msg.prefix(player, prefix_commands, "You have regained your permissions.");
|
|
|
-} else {
|
|
|
- removeAllPermsTemporarly(player_id);
|
|
|
- msg.prefix(player, prefix_commands, "Have fun as a user.");
|
|
|
-}
|
|
|
-goto("wait");
|
|
|
-
|
|
|
@perm
|
|
|
if(size == 0) {
|
|
|
@perm_syntax
|
|
|
msg.prefix(player, prefix_perms, "§r/perm ...");
|
|
|
- msg(player, "§z - give <player> <perm>");
|
|
|
- msg(player, "§z - remove <player> <perm>");
|
|
|
- msg(player, "§z - removeall <player>");
|
|
|
- msg(player, "§z - list <player>");
|
|
|
+ if(perm.has(player, "perm.give")) {
|
|
|
+ msg(player, "§6 - give <player> <perm>");
|
|
|
+ }
|
|
|
+ if(perm.has(player, "perm.remove")) {
|
|
|
+ msg(player, "§6 - remove <player> <perm>");
|
|
|
+ }
|
|
|
+ if(perm.has(player, "perm.removeall")) {
|
|
|
+ msg(player, "§6 - removeall <player>");
|
|
|
+ }
|
|
|
+ if(perm.has(player, "perm.list")) {
|
|
|
+ msg(player, "§6 - list <player>");
|
|
|
+ }
|
|
|
+ if(perm.has(player, "perm.toggle")) {
|
|
|
+ msg(player, "§6 - toggle <player>");
|
|
|
+ }
|
|
|
goto("wait");
|
|
|
}
|
|
|
arg0 = list.getIndex(args, 0);
|
|
|
if(arg0 == "give") {
|
|
|
+ if(!perm.has(player, "perm.give")) {
|
|
|
+ perm.no(player, "perm.give");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
if(size != 3) {
|
|
|
msg.prefix(player, prefix_perms, "/perm give <player> <perm>");
|
|
|
} else {
|
|
|
@@ -1513,6 +1552,10 @@ if(arg0 == "give") {
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(arg0 == "remove") {
|
|
|
+ if(!perm.has(player, "perm.remove")) {
|
|
|
+ perm.no(player, "perm.remove");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
if(size != 3) {
|
|
|
msg.prefix(player, prefix_perms, "/perm remove <player> <perm>");
|
|
|
} else {
|
|
|
@@ -1548,6 +1591,10 @@ if(arg0 == "remove") {
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(arg0 == "removeall") {
|
|
|
+ if(!perm.has(player, "perm.removeall")) {
|
|
|
+ perm.no(player, "perm.removeall");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
if(size != 2) {
|
|
|
msg.prefix(player, prefix_perms, "/perm removeall <player>");
|
|
|
} else {
|
|
|
@@ -1571,6 +1618,10 @@ if(arg0 == "removeall") {
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(arg0 == "list") {
|
|
|
+ if(!perm.has(player, "perm.list")) {
|
|
|
+ perm.no(player, "perm.list");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
if(size != 2) {
|
|
|
msg.prefix(player, prefix_perms, "/perm list <player>");
|
|
|
} else {
|
|
|
@@ -1593,25 +1644,22 @@ if(arg0 == "list") {
|
|
|
}
|
|
|
goto("wait");
|
|
|
}
|
|
|
-goto("perm_syntax");
|
|
|
-
|
|
|
-@door
|
|
|
-if(size == 0) {
|
|
|
- @door_syntax
|
|
|
- msg.prefix(player, prefix_commands, "§r/door ...");
|
|
|
- msg(player, "§6 - true §rSchließt Türen automatisch");
|
|
|
- msg(player, "§6 - false §rTüren manuell schließen");
|
|
|
+if(arg0 == "toggle") {
|
|
|
+ if(!perm.has(player, "perm.toggle")) {
|
|
|
+ perm.no(player, "perm.toggle");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ player_id = player.getId(player);
|
|
|
+ if(perm.has(player, "pseudoPerm")) {
|
|
|
+ reloadAllPerms(player_id);
|
|
|
+ msg.prefix(player, prefix_commands, "You have regained your permissions.");
|
|
|
+ } else {
|
|
|
+ removeAllPermsTemporarly(player_id);
|
|
|
+ msg.prefix(player, prefix_commands, "Have fun as a user.");
|
|
|
+ }
|
|
|
goto("wait");
|
|
|
}
|
|
|
-arg0 = list.getIndex(args, 0);
|
|
|
-if(arg0 == true) {
|
|
|
- player.setAutoCloseDoor(player, true);
|
|
|
- msg.prefix(player, prefix_commands, "Doors now close automatically.");
|
|
|
-} else {
|
|
|
- player.setAutoCloseDoor(player, false);
|
|
|
- msg.prefix(player, prefix_commands, "You have to close doors manually now.");
|
|
|
-}
|
|
|
-goto("wait");
|
|
|
+goto("perm_syntax");
|
|
|
|
|
|
@allsounds
|
|
|
if(size == 0) {
|
|
|
@@ -2086,14 +2134,17 @@ if(size != 1) {
|
|
|
msg(sender, " - ai");
|
|
|
msg(sender, " - chat");
|
|
|
msg(sender, " - commands");
|
|
|
+ msg(sender, " - creative");
|
|
|
msg(sender, " - damage");
|
|
|
msg(sender, " - friends");
|
|
|
msg(sender, " - games");
|
|
|
msg(sender, " - mails");
|
|
|
msg(sender, " - party");
|
|
|
msg(sender, " - perms");
|
|
|
+ msg(sender, " - pumpkin");
|
|
|
msg(sender, " - quests");
|
|
|
msg(sender, " - shop");
|
|
|
+ msg(sender, " - sitting");
|
|
|
msg(sender, " - stats");
|
|
|
msg(sender, " - survival");
|
|
|
msg(sender, " - ticket");
|
|
|
@@ -2110,11 +2161,11 @@ if(arg0 == "commands") {
|
|
|
script.term(script.get());
|
|
|
}
|
|
|
elseif(arg0 == "games") {
|
|
|
- script = script.get("scripts/global/gamecenter.txt");
|
|
|
+ script = script.get("Gamecenter");
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.start("global/gamecenter", "utils/u_general", "utils/u_games", "utils/u_party");
|
|
|
+ script.startNamed("Gamecenter", "global/gamecenter", "utils/u_general", "utils/u_games", "utils/u_party");
|
|
|
}
|
|
|
elseif(arg0 == "party") {
|
|
|
script = script.get("Party");
|
|
|
@@ -2130,6 +2181,13 @@ elseif(arg0 == "damage") {
|
|
|
}
|
|
|
script.startNamed("Damage", "system/damage");
|
|
|
}
|
|
|
+elseif(arg0 == "creative") {
|
|
|
+ script = script.get("Creative");
|
|
|
+ if(script != null) {
|
|
|
+ script.term(script);
|
|
|
+ }
|
|
|
+ script.startNamed("Creative", "system/creative", "utils/u_general");
|
|
|
+}
|
|
|
elseif(arg0 == "ai") {
|
|
|
script = script.get("Ai");
|
|
|
if(script != null) {
|
|
|
@@ -2154,19 +2212,26 @@ elseif(arg0 == "voxel") {
|
|
|
elseif(arg0 == "perms") {
|
|
|
script.start("system/perms", "utils/u_general");
|
|
|
}
|
|
|
+elseif(arg0 == "pumpkin") {
|
|
|
+ script = script.get("Pumpkin");
|
|
|
+ if(script != null) {
|
|
|
+ script.term(script);
|
|
|
+ }
|
|
|
+ script.startNamed("Pumpkin", "global/pumpkin", "utils/u_general");
|
|
|
+}
|
|
|
elseif(arg0 == "stats") {
|
|
|
- script = script.get("scripts/global/ranklist.txt");
|
|
|
+ script = script.get("Ranklist", "scripts/global/ranklist.txt");
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.start("global/ranklist", "utils/u_general", "utils/u_games");
|
|
|
+ script.startNamed("Ranklist", "global/ranklist", "utils/u_general", "utils/u_games");
|
|
|
}
|
|
|
elseif(arg0 == "shop") {
|
|
|
- script = script.get("scripts/global/chestshops.txt");
|
|
|
+ script = script.get("Shops");
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.start("global/chestshops", "utils/u_general");
|
|
|
+ script.startNamed("Shops", "global/chestshops", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "mails") {
|
|
|
script = script.get("Mails");
|
|
|
@@ -2189,6 +2254,13 @@ elseif(arg0 == "quests") {
|
|
|
}
|
|
|
script.startNamed("SpawnQuests", "storydorf/spawn/core", "utils/u_general");
|
|
|
}
|
|
|
+elseif(arg0 == "sitting") {
|
|
|
+ script = script.get("Sitting");
|
|
|
+ if(script != null) {
|
|
|
+ script.term(script);
|
|
|
+ }
|
|
|
+ script.startNamed("Sitting", "global/sitting", "utils/u_general");
|
|
|
+}
|
|
|
elseif(arg0 == "survival") {
|
|
|
script = script.get("Survival");
|
|
|
if(script != null) {
|
|
|
@@ -2334,15 +2406,7 @@ if(size == 0) {
|
|
|
//Erstes Mitternacht des gewählten Jahres festlegen
|
|
|
now_day = time.getDay(calendar);
|
|
|
time.nextDay(calendar);
|
|
|
- month_days_diff = 0;
|
|
|
- for(i = 1; i < now_month; i++) {
|
|
|
- month_days_diff += time.getMonthDays(i, now_year);
|
|
|
- }
|
|
|
- year_days_diff = 0;
|
|
|
- for(i = year; i < now_year; i++) {
|
|
|
- year_days_diff += time.getYearDays(i);
|
|
|
- }
|
|
|
- midnight = time.from(calendar) - (year_days_diff + month_days_diff + now_day) * 86400000;
|
|
|
+ midnight = time.from(calendar) - (time.getDaysBetween(1, 1, year, now_day, now_month, now_year) + 1) * 86400000;
|
|
|
//Monats-Spielzeit berechnen
|
|
|
temp_list = list.new();
|
|
|
list.add(temp_list, playtime.getInterval(midnight - time.getMonthDays(12, year - 1) * 86400000, midnight)); //Dezember des Vorjahres hinzufügen
|
|
|
@@ -2398,7 +2462,7 @@ if(size == 0) {
|
|
|
now_month = time.getMonth(calendar);
|
|
|
now_year = time.getYear(calendar);
|
|
|
year = now_year;
|
|
|
- if(size == 1) {
|
|
|
+ if(size == 1) {
|
|
|
month = now_month;
|
|
|
} else {
|
|
|
month = list.getIndex(args, 1);
|
|
|
@@ -2433,15 +2497,7 @@ if(size == 0) {
|
|
|
//Erstes Mitternacht des gewählten Monats festlegen
|
|
|
now_day = time.getDay(calendar);
|
|
|
time.nextDay(calendar);
|
|
|
- month_days_diff = 0;
|
|
|
- for(i = month; i < now_month; i++) {
|
|
|
- month_days_diff += time.getMonthDays(i, now_year);
|
|
|
- }
|
|
|
- year_days_diff = 0;
|
|
|
- for(i = year; i < now_year; i++) {
|
|
|
- year_days_diff += time.getYearDays(i);
|
|
|
- }
|
|
|
- midnight = time.from(calendar) - (year_days_diff + month_days_diff + now_day) * 86400000;
|
|
|
+ midnight = time.from(calendar) - (time.getDaysBetween(1, month, year, now_day, now_month, now_year) + 1) * 86400000;
|
|
|
//Tages-Spielzeit berechnen
|
|
|
for(i = 1; i <= time.getMonthDays(month, year); i++) {
|
|
|
players = playtime.getPlayersPerInterval(midnight, midnight + 86400000);
|
|
|
@@ -2946,13 +3002,17 @@ if(size < 2) {
|
|
|
}
|
|
|
arg0 = list.getIndex(args, 0);
|
|
|
if(arg0 == "set") {
|
|
|
- name = text.replace(text.concatList(args, " ", 1, size - 1), "&", "§");
|
|
|
+ name = text.concatList(args, " ", 1, size - 1);
|
|
|
+ name = text.replace(name, "&", "§");
|
|
|
+ name = text.replace(name, "\\n", "\n");
|
|
|
ent = entity.spawn("km:nobody", entity.getLocation(player), "{NoGravity:true}");
|
|
|
entity.setName(ent, name);
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(arg0 == "rename") {
|
|
|
- name = text.replace(text.concatList(args, " ", 1, size - 1), "&", "§");
|
|
|
+ name = text.concatList(args, " ", 1, size - 1);
|
|
|
+ name = text.replace(name, "&", "§");
|
|
|
+ name = text.replace(name, "\\n", "\n");
|
|
|
ent_list = living.near(player, 5);
|
|
|
for(i = 0; i < list.getSize(ent_list); i++) {
|
|
|
ent = list.getIndex(ent_list, i);
|
|
|
@@ -3008,19 +3068,19 @@ if(size == 0) {
|
|
|
msg.prefix(player, prefix_commands, "/sign <1-4> [text]");
|
|
|
goto("wait");
|
|
|
}
|
|
|
-target = player.getTarget(player, 5, false, false);
|
|
|
-targettype = block.getType(target);
|
|
|
-if(!(targettype == "minecraft:oak_sign" || targettype == "minecraft:oak_wall_sign" || targettype == "minecraft:spruce_sign" || targettype == "minecraft:spruce_wall_sign" || targettype == "minecraft:birch_sign" || targettype == "minecraft:birch_wall_sign" || targettype == "minecraft:jungle_sign" || targettype == "minecraft:jungle_wall_sign" || targettype == "minecraft:acacia_sign" || targettype == "minecraft:acacia_wall_sign" || targettype == "minecraft:dark_oak_sign" || targettype == "minecraft:dark_oak_wall_sign")) {
|
|
|
- msg.prefix(player, prefix_commands, "Du bist nicht auf ein Schild gerichtet.");
|
|
|
+target_loc = player.getTarget(player, 5, false, false);
|
|
|
+block = block.get(target_loc);
|
|
|
+if(!block.hasTag(sign_tag, block)) {
|
|
|
+ msg.prefix(player, prefix_commands, "Look at a sign.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
line = list.getIndex(args, 0);
|
|
|
if(!isDouble(line)) {
|
|
|
- msg.prefix(player, prefix_commands, "Zahl erwartet");
|
|
|
+ msg.prefix(player, prefix_commands, "Number expected.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(!(line == 1 || line == 2 || line == 3 || line == 4)) {
|
|
|
- msg.prefix(player, prefix_commands, "Du musst eine Zahl von 1 bis 4 eingeben.");
|
|
|
+ msg.prefix(player, prefix_commands, "Number between 1 and 5 expected.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
string = "";
|
|
|
@@ -3039,7 +3099,7 @@ if(size > 1) {
|
|
|
}
|
|
|
}
|
|
|
string = text.replace(string, "&", "§");
|
|
|
-block.setSign(target, line - 1, string);
|
|
|
+block.setSign(target_loc, line - 1, string);
|
|
|
goto("wait");
|
|
|
|
|
|
@head
|
|
|
@@ -3766,7 +3826,9 @@ if(arg0 == "create" || arg0 == "c") {
|
|
|
msg.prefix(player, prefix_plot, "Eckpunkte haben unterschiedliche Welten");
|
|
|
goto("wait");
|
|
|
}
|
|
|
- if(!perm.has(player, "plot.other")) {
|
|
|
+ if(perm.has(player, "plot.other")) {
|
|
|
+ msg.prefix(player, prefix_plot, "Plot created.");
|
|
|
+ } else {
|
|
|
world_name = world.getName(world1);
|
|
|
if(!isSurvWorldName(world_name)) {
|
|
|
msg.prefix(player, "§6Perms", "Du hast in dieser Welt keine Permission dafür.");
|
|
|
@@ -3793,11 +3855,12 @@ if(arg0 == "create" || arg0 == "c") {
|
|
|
area = length * width;
|
|
|
used_area = player.getUsedPlotArea(player);
|
|
|
if(!player.hasEnoughFreeArea(player, area)) {
|
|
|
- msg.prefix(player, prefix_plot, concat("You used ", text.number(used_area) " / ", text.number(player.getFreePlotArea(player)), " plot blocks."));
|
|
|
+ msg.prefix(player, prefix_plot, concat("You used ", text.number(used_area), " / ", text.number(player.getFreePlotArea(player)), " plot blocks."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
new_area = used_area + area;
|
|
|
player.setUsedPlotArea(player, new_area);
|
|
|
+ msg.prefix(player, prefix_plot, concat("Plot created. New used plot area: ", text.number(new_area)));
|
|
|
}
|
|
|
//Plot erstellen
|
|
|
loc.setY(loc1, 0);
|
|
|
@@ -3808,7 +3871,6 @@ if(arg0 == "create" || arg0 == "c") {
|
|
|
plot.addPlayer(plot, player_name);
|
|
|
plot.setRank(plot, player_id, "leader");
|
|
|
offerRank(player, "§eSiedler");
|
|
|
- msg.prefix(player, prefix_plot, concat("Plot created. New used plot area: ", text.number(new_area)));
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(arg0 == "create3d" || arg0 == "add3d") {
|
|
|
@@ -3824,7 +3886,9 @@ if(arg0 == "create3d" || arg0 == "add3d") {
|
|
|
msg.prefix(player, prefix_plot, "Eckpunkte haben unterschiedliche Welten");
|
|
|
goto("wait");
|
|
|
}
|
|
|
- if(!perm.has(player, "plot.other")) {
|
|
|
+ if(perm.has(player, "plot.other")) {
|
|
|
+ msg.prefix(player, prefix_plot, "3DPlot created.");
|
|
|
+ } else {
|
|
|
world_name = world.getName(world1);
|
|
|
if(!isSurvWorldName(world_name)) {
|
|
|
msg.prefix(player, "§6Perms", "Du hast in dieser Welt keine Permission dafür.");
|
|
|
@@ -3851,11 +3915,12 @@ if(arg0 == "create3d" || arg0 == "add3d") {
|
|
|
area = length * width;
|
|
|
used_area = player.getUsedPlotArea(player);
|
|
|
if(!player.hasEnoughFreeArea(player, area)) {
|
|
|
- msg.prefix(player, prefix_plot, concat("You used ", text.number(used_area) " / ", text.number(player.getFreePlotArea(player)), " plot blocks."));
|
|
|
+ msg.prefix(player, prefix_plot, concat("You used ", text.number(used_area), " / ", text.number(player.getFreePlotArea(player)), " plot blocks."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
new_area = used_area + area;
|
|
|
player.setUsedPlotArea(player, new_area);
|
|
|
+ msg.prefix(player, prefix_plot, concat("3DPlot created. New used plot area: ", text.number(new_area)));
|
|
|
}
|
|
|
//Plot erstellen
|
|
|
plot = plot.add(loc1, loc2);
|
|
|
@@ -3863,7 +3928,6 @@ if(arg0 == "create3d" || arg0 == "add3d") {
|
|
|
plot.addPlayer(plot, player_name);
|
|
|
plot.setRank(plot, player_id, "leader");
|
|
|
offerRank(player, "§eSiedler");
|
|
|
- msg.prefix(player, prefix_plot, concat("3DPlot created. New used plot area: ", text.number(new_area)));
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(arg0 == "pos1" || arg0 == "pos2") {
|
|
|
@@ -4211,7 +4275,7 @@ if(size == 2) {
|
|
|
goto("wait");
|
|
|
}
|
|
|
}
|
|
|
-player.setSpeed(affectedplayer, speed / 20);
|
|
|
+player.setSpeed(affectedplayer, speed);
|
|
|
msg.prefix(affectedplayer, prefix_commands, concat("Set your speed to ", text.number(speed), "."));
|
|
|
if(affectedplayer != player) {
|
|
|
affectedname = player.getName(affectedplayer);
|
|
|
@@ -4219,14 +4283,6 @@ if(affectedplayer != player) {
|
|
|
}
|
|
|
goto("wait");
|
|
|
|
|
|
-@mayo
|
|
|
-msg(player, "Nein ", player_name, ", Mayonnaise ist kein Instrument.");
|
|
|
-goto("wait");
|
|
|
-
|
|
|
-@locate
|
|
|
-msg(player, "Command deactivated.");
|
|
|
-goto("wait");
|
|
|
-
|
|
|
@butcher
|
|
|
loc = entity.getLocation(player);
|
|
|
world = loc.getWorld(loc);
|
|
|
@@ -4458,18 +4514,18 @@ if(!player.doesAcceptTpaRequests(p)) {
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(player)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport in this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(p)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport to this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
addTpaRequest(player.getUuid(player), p_uuid);
|
|
|
msg(player, concat("§6Teleportanfrage: [§c", player_name, "§6 -> §c ", p_name, "§6]"));
|
|
|
-msg(p, concat("§6Teleportanfrage: [§c", player_name, "§6 -> §c ", p_name, "§6] "), text.click("[§aAnnehmen§6]", concat("/tpaccept ", player_name)));
|
|
|
+msg(p, concat("§6Teleportanfrage: [§c", player_name, "§6 -> §c ", p_name, "§6] "), text.click("§6[§aAnnehmen§6]", concat("/tpaccept ", player_name)));
|
|
|
goto("wait");
|
|
|
|
|
|
@tpahere
|
|
|
@@ -4494,18 +4550,18 @@ if(!player.doesAcceptTpaRequests(p)) {
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(player)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, concat("§c", p_name, "§r darf sich in diese Welt nicht teleportieren."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(p)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, concat("§c", p_name, "§r darf sich in seiner Welt nicht teleportieren."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
addTpaRequest(p_uuid, player.getUuid(player));
|
|
|
msg(player, concat("§6Teleportanfrage: [§c", p_name, "§6 -> §c ", player_name, "§6]"));
|
|
|
-msg(p, concat("§6Teleportanfrage: [§c", p_name, "§6 -> §c ", player_name, "§6] "), text.click("[§aAnnehmen§6]", concat("/tpaccepthere ", player_name)));
|
|
|
+msg(p, concat("§6Teleportanfrage: [§c", p_name, "§6 -> §c ", player_name, "§6] "), text.click("§6[§aAnnehmen§6]", concat("/tpaccepthere ", player_name)));
|
|
|
goto("wait");
|
|
|
|
|
|
@tpaccept
|
|
|
@@ -4526,12 +4582,12 @@ if(p == null) {
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(player)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, concat("§c", p_name, "§r darf sich in diese Welt nicht teleportieren."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(p)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, concat("§c", p_name, "§r darf sich in seiner Welt nicht teleportieren."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -4562,12 +4618,12 @@ if(p == null) {
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(player)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport in this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(p)));
|
|
|
-if(!isSurvWorldName(world_name)) {
|
|
|
+if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport to this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -4580,16 +4636,6 @@ location = entity.getLocation(p);
|
|
|
player.teleport(player, location, true);
|
|
|
goto("wait");
|
|
|
|
|
|
-@tptoggle
|
|
|
-tptoggle = player.doesAcceptTpaRequests(player);
|
|
|
-if(tptoggle) {
|
|
|
- msg.prefix(player, prefix_commands, "You now generally decline teleport requests.");
|
|
|
-} else {
|
|
|
- msg.prefix(player, prefix_commands, "You now generally accept teleport requests.");
|
|
|
-}
|
|
|
-player.acceptTpaRequests(player, !tptoggle);
|
|
|
-goto("wait");
|
|
|
-
|
|
|
@teleport
|
|
|
if(size < 1 || size > 2) {
|
|
|
if(perm.has(player, "teleport.other")) {
|
|
|
@@ -4739,12 +4785,12 @@ if(size == 2) {
|
|
|
} else {
|
|
|
if(!perm.has(player, "warp.create")) {
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(player)));
|
|
|
- if(!isSurvWorldName(world_name)) {
|
|
|
+ if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport in this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
world_name = world.getName(loc.getWorld(warploc));
|
|
|
- if(!isSurvWorldName(world_name)) {
|
|
|
+ if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport to this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -5036,7 +5082,7 @@ if(player.hasMinigame(player)) {
|
|
|
hasPerms = perm.has(player, "isTeam");
|
|
|
if(!hasPerms) {
|
|
|
world_name = world.getName(loc.getWorld(entity.getLocation(player)));
|
|
|
- if(!isSurvWorldName(world_name)) {
|
|
|
+ if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport in this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -5053,7 +5099,7 @@ if(world == null) {
|
|
|
}
|
|
|
if(!hasPerms) {
|
|
|
world_name = world.getName(world);
|
|
|
- if(!isSurvWorldName(world_name)) {
|
|
|
+ if(isGamesWorldName(world_name)) {
|
|
|
msg.prefix(player, prefix_commands, "You won't teleport to this world.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -5081,6 +5127,7 @@ if(size != 1) {
|
|
|
msg.prefix(player, prefix_commands, "§r/setspawn ...");
|
|
|
msg(player, "§6 - server");
|
|
|
msg(player, "§6 - games");
|
|
|
+ msg(player, "§6 - creative");
|
|
|
goto("wait");
|
|
|
}
|
|
|
arg0 = list.getIndex(args, 0);
|
|
|
@@ -5092,6 +5139,9 @@ if(arg0 == "games") {
|
|
|
} elseif(arg0 == "server") {
|
|
|
config.set(config, "serverspawn", new_spawn);
|
|
|
msg.prefix(player, prefix_commands, "New main Spawn set.");
|
|
|
+} elseif(arg0 == "creative") {
|
|
|
+ config.set(config, "creativespawn", new_spawn);
|
|
|
+ msg.prefix(player, prefix_commands, "New spawn for creative world set.");
|
|
|
} else {
|
|
|
goto("setspawnhelp");
|
|
|
}
|
|
|
@@ -5112,14 +5162,14 @@ if(size == 1) {
|
|
|
}
|
|
|
if(player != affectedplayer) {
|
|
|
affectedname = player.getName(affectedplayer);
|
|
|
- msg.prefix(player, prefix_commands, concat(affectedname, " wurde geheilt."));
|
|
|
+ msg.prefix(player, prefix_commands, concat(affectedname, " was healed."));
|
|
|
}
|
|
|
}
|
|
|
entity.heal(affectedplayer, 50);
|
|
|
player.setHunger(affectedplayer, 20);
|
|
|
player.setSaturation(affectedplayer, 5);
|
|
|
entity.clearEffects(affectedplayer);
|
|
|
-msg.prefix(affectedplayer, prefix_commands, "Du wurdest geheilt.");
|
|
|
+msg.prefix(affectedplayer, prefix_commands, "You have been healed.");
|
|
|
goto("wait");
|
|
|
|
|
|
@inv
|
|
|
@@ -5139,7 +5189,7 @@ if(size == 0) {
|
|
|
msg(player, "§6 - saveFor <player> <world> §rSaves your inventory for a player");
|
|
|
}
|
|
|
if(perm.has(player, "inv.loadFrom")) {
|
|
|
- msg(player, "§6 - load <player> <world> §rLoads a player's inventory for you");
|
|
|
+ msg(player, "§6 - loadFrom <player> <world> §rLoads a player's inventory for you");
|
|
|
}
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -5403,7 +5453,7 @@ if(arg0 == "unload") {
|
|
|
}
|
|
|
if(arg0 == "setspawn") {
|
|
|
location = entity.getLocation(player);
|
|
|
- world.setSpawn(location);
|
|
|
+ world.setSpawn(location, 0);
|
|
|
msg.prefix(player, prefix_world, concat("New spawn of the world ", world.getName(loc.getWorld(location)), " set."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
@@ -5766,20 +5816,14 @@ function setCommandHelps() {
|
|
|
addCommandHelp("silentjoin");
|
|
|
addCommandHelp("wusi");
|
|
|
addCommandHelp("nowb");
|
|
|
- addCommandHelp("spawn");
|
|
|
addCommandHelp("coords");
|
|
|
- addCommandHelp("mayo");
|
|
|
addCommandHelp("ping");
|
|
|
- addCommandHelp("permtoggle");
|
|
|
- addCommandHelp("games");
|
|
|
addCommandHelp("rank");
|
|
|
- addCommandHelp("showcoords");
|
|
|
addCommandHelp("back");
|
|
|
addCommandHelp("boost");
|
|
|
addCommandHelp("bug");
|
|
|
addCommandHelp("report");
|
|
|
addCommandHelp("startgame");
|
|
|
- addCommandHelp("tptoggle");
|
|
|
addCommandHelp("top");
|
|
|
addCommandHelp("repair");
|
|
|
|
|
|
@@ -5805,8 +5849,6 @@ function setCommandHelps() {
|
|
|
help = addCommandHelp("afk");
|
|
|
addCommandAlias(help, "afklo", "afk");
|
|
|
|
|
|
- addCommandHelpChildBool("door", "wusi");
|
|
|
-
|
|
|
help = addCommandHelp("leave");
|
|
|
addCommandAlias(help, "l", "leave");
|
|
|
addCommandAlias(help, "hub", "leave");
|
|
|
@@ -5830,13 +5872,16 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, command.newHelpLiteral("ai"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("chat"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("commands"));
|
|
|
- command.addHelpChild(help, command.newHelpLiteral("games"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("creative"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("damage"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("games"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("mails"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("party"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("perms"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("pumpkin"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("quests"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("shop"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("sitting"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("stats"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("survival"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("ticket"));
|
|
|
@@ -5896,6 +5941,29 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, command.newHelpLiteral("stop"));
|
|
|
command.addHelp(help);
|
|
|
|
|
|
+ help = command.newHelp("spawn", "spawn");
|
|
|
+ command.addHelpChild(help, command.newHelpSpecial("Player", "player", "teleport.other"));
|
|
|
+ command.addHelp(help);
|
|
|
+
|
|
|
+ help = command.newHelp("games", "games");
|
|
|
+ command.addHelpChild(help, command.newHelpSpecial("Player", "player", "teleport.other"));
|
|
|
+ command.addHelp(help);
|
|
|
+
|
|
|
+ help = command.newHelp("ass", "ass");
|
|
|
+ //ass set <name>
|
|
|
+ helpArg0 = command.newHelpLiteral("set");
|
|
|
+ command.addHelpChild(helpArg0, command.newHelpString("name", true));
|
|
|
+ command.addHelpChild(help, helpArg0);
|
|
|
+ //ass rename <name>
|
|
|
+ helpArg0 = command.newHelpLiteral("rename");
|
|
|
+ command.addHelpChild(helpArg0, command.newHelpString("name", true));
|
|
|
+ command.addHelpChild(help, helpArg0);
|
|
|
+ //ass remove <radius>
|
|
|
+ helpArg0 = command.newHelpLiteral("remove");
|
|
|
+ command.addHelpChild(helpArg0, command.newHelpInt("radius", 0, 30));
|
|
|
+ command.addHelpChild(help, helpArg0);
|
|
|
+ command.addHelp(help);
|
|
|
+
|
|
|
help = command.newHelp("tppos", "tppos");
|
|
|
helpArg0 = command.newHelpInt("x", -16000, 16000);
|
|
|
helpArg1 = command.newHelpInt("y", 0, 1000);
|
|
|
@@ -5934,6 +6002,7 @@ function setCommandHelps() {
|
|
|
help = command.newHelp("setspawn", "setspawn");
|
|
|
command.addHelpChild(help, command.newHelpLiteral("server"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("games"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("creative"));
|
|
|
command.addHelp(help);
|
|
|
|
|
|
help = command.newHelp("datatools", "datatools");
|
|
|
@@ -6106,6 +6175,8 @@ function setCommandHelps() {
|
|
|
helpArg0 = command.newHelpLiteral("list");
|
|
|
command.addHelpChild(helpArg0, command.newHelpSpecial("Player", "player"));
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
+ //perm toggle
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("toggle"));
|
|
|
command.addHelp(help);
|
|
|
|
|
|
help = command.newHelp("script", "script");
|
|
|
@@ -6370,6 +6441,7 @@ function setCommandHelps() {
|
|
|
help = command.newHelp("errordebug", "errordebug");
|
|
|
command.addHelpChild(help, command.newHelpLiteral("list"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("clear"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("toggle"));
|
|
|
command.addHelp(help);
|
|
|
|
|
|
help = command.newHelp("error", "error");
|
|
|
@@ -6860,4 +6932,45 @@ function time.getMonthDays(month, year) {
|
|
|
days++;
|
|
|
}
|
|
|
return days;
|
|
|
+}
|
|
|
+
|
|
|
+function time.getDaysBetween(day1, month1, year1, day2, month2, year2) {
|
|
|
+ d_days = 0;
|
|
|
+ m_days = 0;
|
|
|
+ y_days = 0;
|
|
|
+ y = 0;
|
|
|
+ m = 0;
|
|
|
+ d = 0;
|
|
|
+ //Volle Jahre
|
|
|
+ for(year = year1 + 1; year < year2; year++) {
|
|
|
+ y_days += time.getYearDays(year);
|
|
|
+ y++;
|
|
|
+ }
|
|
|
+ if(year1 == year2) {
|
|
|
+ //Volle Monate
|
|
|
+ for(month = month1 + 1; month < month2; month++) {
|
|
|
+ m_days += time.getMonthDays(month, year1);
|
|
|
+ }
|
|
|
+ //Volle Tage
|
|
|
+ if(month1 == month2) {
|
|
|
+ d_days = day2 - day1;
|
|
|
+ } else {
|
|
|
+ d_days += map.get($monthdays, month1) - day1;
|
|
|
+ d_days += day2;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //Volle Monate
|
|
|
+ for(month = month1 + 1; month < 13; month++) {
|
|
|
+ m_days += time.getMonthDays(month, year1);
|
|
|
+ m++;
|
|
|
+ }
|
|
|
+ for(month = 1; month < month2; month++) {
|
|
|
+ m_days += time.getMonthDays(month, year2);
|
|
|
+ m++;
|
|
|
+ }
|
|
|
+ //Volle Tage
|
|
|
+ d_days += map.get($monthdays, month1) - day1;
|
|
|
+ d_days += day2;
|
|
|
+ }
|
|
|
+ return y_days + m_days + d_days;
|
|
|
}
|
Marvin Löschenkohl