|
@@ -68,6 +68,7 @@ command.register("databank", "Databank-Commands");
|
|
|
command.register("datatools", "Datatools-Commands");
|
|
|
command.register("enchant", "Enchants an item in your hand");
|
|
|
command.register("enderchest", "Shows enderchests");
|
|
|
+command.register("entities", "Lists all entities in a world");
|
|
|
command.register("error", "Error-Logger");
|
|
|
command.register("errordebug", "Debug-Logger");
|
|
|
command.register("feed", "Fills hunger bar");
|
|
@@ -1119,6 +1120,7 @@ if(event == "function_key") {
|
|
|
msg.prefix(player, prefix_commands, "Only during night possible.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
+ player_uuid = player.getUuid(player);
|
|
|
if(set.contains(skip_night_set, player_uuid)) {
|
|
|
msg.prefix(player, prefix_commands, "Already voted.");
|
|
|
goto("wait");
|
|
@@ -1140,6 +1142,52 @@ if(event == "player_data_tick") {
|
|
|
}
|
|
|
goto("wait");
|
|
|
|
|
|
+@entities
|
|
|
+if(size != 1) {
|
|
|
+ msg.prefix(player, prefix_quest, "/entities <world>");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+world_name = text.toLowerCase(list.getIndex(args, 0));
|
|
|
+world = world.get(world_name);
|
|
|
+if(world == null) {
|
|
|
+ msg.prefix(player, prefix_world, "This world is not loaded.");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+list = world.getEntities(world);
|
|
|
+size = list.getSize(list);
|
|
|
+map = map.new();
|
|
|
+living = 0;
|
|
|
+for(i = 0; i < size; i++) {
|
|
|
+ element = list.getIndex(list, i);
|
|
|
+ if(isLiving(element)) {
|
|
|
+ living++;
|
|
|
+ //living.removeAi(element);
|
|
|
+ entity_type = entity.getType(element);
|
|
|
+ n = map.get(map, entity_type);
|
|
|
+ if(n == null) {
|
|
|
+ map.add(map, entity_type, 1);
|
|
|
+ } else {
|
|
|
+ map.add(map, entity_type, n + 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+msg(player, "§0-------------------------------------------------");
|
|
|
+msg(player, "Living: ", living);
|
|
|
+iter = map.iterator(map);
|
|
|
+table = table.new("§b", 14, 14);
|
|
|
+msg(player, table.getStart(table));
|
|
|
+while(hasNext(iter)) {
|
|
|
+ element1 = next(iter);
|
|
|
+ if(hasNext(iter)) {
|
|
|
+ element2 = next(iter);
|
|
|
+ } else {
|
|
|
+ element2 = "";
|
|
|
+ }
|
|
|
+ msg(player, table.get(table, element1, element2));
|
|
|
+}
|
|
|
+msg(player, table.getEnd(table));
|
|
|
+goto("wait");
|
|
|
+
|
|
|
@RickRole_play
|
|
|
if(rickIndex < rick_sounds_amount) {
|
|
|
pitch = list.getIndex(RickRollSounds, rickIndex);
|
|
@@ -2663,7 +2711,7 @@ if(arg0 == "remove") {
|
|
|
player_id = player.getId(player);
|
|
|
if(player_id != 2) {
|
|
|
if(p_id == 2) {
|
|
|
- msg(player, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(player, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
}
|
|
@@ -2695,7 +2743,7 @@ if(arg0 == "removeall") {
|
|
|
player_id = player.getId(player);
|
|
|
if(player_id != 2) {
|
|
|
if(p_id == 2) {
|
|
|
- msg(player, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(player, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
}
|
|
@@ -3258,6 +3306,7 @@ if(size != 1) {
|
|
|
msg(sender, " - lectern");
|
|
|
msg(sender, " - loom");
|
|
|
msg(sender, " - mails");
|
|
|
+ msg(sender, " - mobarena");
|
|
|
msg(sender, " - perms");
|
|
|
msg(sender, " - playerdata");
|
|
|
msg(sender, " - pumpkin");
|
|
@@ -3427,6 +3476,13 @@ elseif(arg0 == "mails") {
|
|
|
}
|
|
|
script.startNamed("Mails", "utils/u_error", "system/mailsystem", "utils/u_general");
|
|
|
}
|
|
|
+elseif(arg0 == "mobarena") {
|
|
|
+ script = script.get("Mobarena");
|
|
|
+ if(script != null) {
|
|
|
+ script.term(script);
|
|
|
+ }
|
|
|
+ script.startNamed("Mobarena", "utils/u_error", "survival/mobarena", "utils/u_general");
|
|
|
+}
|
|
|
elseif(arg0 == "ticket") {
|
|
|
script = script.get("Ticket");
|
|
|
if(script != null) {
|
|
@@ -4437,7 +4493,7 @@ if(!isOnline(p_name)) {
|
|
|
p = read.player(p_name);
|
|
|
p_name = player.getName(p);
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
msg("online", concat("§c", p_name, " was muted by ", sender_name, "."));
|
|
@@ -4457,7 +4513,7 @@ if(!isOnline(p_name)) {
|
|
|
p = read.player(p_name);
|
|
|
p_name = player.getName(p);
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
msg("online", concat("§c", p_name, " was unmuted by ", sender_name, "."));
|
|
@@ -4477,7 +4533,7 @@ if(!isOnline(p_name)) {
|
|
|
p = read.player(p_name);
|
|
|
p_name = player.getName(p);
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(size > 1) {
|
|
@@ -4503,7 +4559,7 @@ if(!isOnline(p_name)) {
|
|
|
p = read.player(p_name);
|
|
|
p_name = player.getName(p);
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(size > 1) {
|
|
@@ -4529,7 +4585,7 @@ if(!isOnline(p_name)) {
|
|
|
p = read.player(p_name);
|
|
|
p_name = player.getName(p);
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(player, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(player, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
head.add(p, 0, sender_name, 0.4, 0.05, 0.2, 0.35);
|
|
@@ -4561,7 +4617,7 @@ if(!checkIfEverOnline(p_name)) {
|
|
|
}
|
|
|
p_name = player.getName(player.getUuid(p_name));
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(size > 1) {
|
|
@@ -4592,7 +4648,7 @@ if(!checkIfEverOnline(p_name)) {
|
|
|
}
|
|
|
p_name = player.getName(player.getUuid(p_name));
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(size > 1) {
|
|
@@ -4636,7 +4692,7 @@ if(!checkIfEverOnline(p_name)) {
|
|
|
}
|
|
|
p_name = player.getName(player.getUuid(p_name));
|
|
|
if(p_name == "marvinius") {
|
|
|
- msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
|
|
|
+ msg(sender, "§cSorry §b¯\\_(._.)_/¯");
|
|
|
goto("wait");
|
|
|
}
|
|
|
days = list.getIndex(args, 1);
|
|
@@ -4678,26 +4734,32 @@ if(size == 0) {
|
|
|
@plothelp
|
|
|
msg.prefix(player, prefix_plot, "/plot ...");
|
|
|
msg(player, "§d - info §rReturns info about current location");
|
|
|
+ if(!perm.has(player, "plot.moreinfo")) {
|
|
|
+ msg(player, "§d - list §rLists your plots");
|
|
|
+ }
|
|
|
+ msg(player, "");
|
|
|
msg(player, "§d - pos1/pos2 §rSet corner points");
|
|
|
msg(player, "§d - create §rCreates a (sub-)plot (Y: 0 - 255)");
|
|
|
msg(player, "§d - create3D §rCreates a 3D (sub-)plot");
|
|
|
+ msg(player, "");
|
|
|
msg(player, "§d - remove [id] §rRemoves a plot");
|
|
|
msg(player, "§d - expand <anzahl> [direction] [id] §rExpands a plot");
|
|
|
msg(player, "§d - name [id] <name> §rRenames a plot");
|
|
|
+ msg(player, "");
|
|
|
msg(player, "§d - share <player> [id] §rAdd a player to a plot");
|
|
|
msg(player, "§d - kick <player> [id] §rRemove a player from a plot");
|
|
|
msg(player, "§d - leader <player> [id] §rPromote to plot-leader");
|
|
|
msg(player, "§d - mod <player> [id] §rPromote to plot-mod");
|
|
|
msg(player, "§d - chest <player> [id] §rAllows a player to open chests");
|
|
|
- msg(player, "§d - raise §rRaises a plot to a city");
|
|
|
+ msg(player, "");
|
|
|
+ msg(player, "§d - raise §rRaises a plot to a city. Costs §610 gold snuvis§r.");
|
|
|
msg(player, "§d - sell <price> §rSells a sub-plot");
|
|
|
+ msg(player, "");
|
|
|
if(perm.has(player, "plot.moreinfo")) {
|
|
|
msg(player, "§d - list [player] §rLists all plots from a player");
|
|
|
msg(player, "§d - moreinfo [id] §rReturns more detailed infos");
|
|
|
msg(player, "§d - listall §rLists all plots");
|
|
|
msg(player, "§d - flags <flags> <boolean> §rSet all flags to the boolean");
|
|
|
- } else {
|
|
|
- msg(player, "§d - list §rLists your plots");
|
|
|
}
|
|
|
goto("wait");
|
|
|
}
|
|
@@ -4782,15 +4844,6 @@ if(arg0 == "raise") {
|
|
|
msg.prefix(player, prefix_plot, "You aren't on a plot.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
- if(!player.isClanLeader(player)) {
|
|
|
- msg.prefix(player, prefix_plot, "Only a clan leader can do this.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- clan_id = player.getClanId(player);
|
|
|
- if(clan.getMembersAmount(clan_id) < 5) {
|
|
|
- msg.prefix(player, prefix_plot, "Your clan needs 4 members to do this.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
plot = list.getIndex(plot_list, 0);
|
|
|
if(plot.isCity(plot)) {
|
|
|
msg.prefix(player, prefix_plot, "This plot is already a city.");
|
|
@@ -4811,11 +4864,11 @@ if(arg0 == "raise") {
|
|
|
length = math.abs(x1 - x2) + 1;
|
|
|
width = math.abs(z1 - z2) + 1;
|
|
|
plot_size = length * width;
|
|
|
- if(plot_size < 900) {
|
|
|
- msg.prefix(player, prefix_plot, "Your plot must be over 900m2.");
|
|
|
+ if(plot_size < 2500) {
|
|
|
+ msg.prefix(player, prefix_plot, "Your plot must be over 2500m2.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
- snuvis = 4096;
|
|
|
+ snuvis = 40960;
|
|
|
if(!hasEnoughMoney(player, snuvis)) {
|
|
|
msg.prefix(player, prefix_plot, concat("You'll need §6", text.number(snuvis), "§r snuvis for this."));
|
|
|
goto("wait");
|
|
@@ -6160,14 +6213,14 @@ goto("wait");
|
|
|
if(size == 0) {
|
|
|
@homesyntax
|
|
|
msg.prefix(player, prefix_commands, "/home ...");
|
|
|
- msg(player, "§6 - set <home> §rSets a home");
|
|
|
- msg(player, "§6 - delete <home> §rDeletes a home");
|
|
|
+ msg(player, "§6 - set <name> §rSets a home");
|
|
|
+ msg(player, "§6 - delete <name> §rDeletes a home");
|
|
|
if(perm.has(player, "home.other")) {
|
|
|
msg(player, "§6 - list [player] §rLists all homes");
|
|
|
- msg(player, "§6 - <home> [player] §rTeleports to a home");
|
|
|
+ msg(player, "§6 - <name> [player] §rTeleports to a home");
|
|
|
} else {
|
|
|
msg(player, "§6 - list §rLists your homes");
|
|
|
- msg(player, "§6 - <home> §rTeleports to your home");
|
|
|
+ msg(player, "§6 - <name> §rTeleports to your home");
|
|
|
}
|
|
|
goto("wait");
|
|
|
}
|
|
@@ -6991,26 +7044,30 @@ goto("wait");
|
|
|
if(size == 0) {
|
|
|
@clanhelp
|
|
|
msg.prefix(player, prefix_clan, "§r/clan...");
|
|
|
- msg(player, "§2 - invite <name> §rInvites a player");
|
|
|
- msg(player, "§2 - accept <id/name/tag> §rAccepts an invitation");
|
|
|
msg(player, "§2 - info [id/name/tag] §rReturns info about a clan");
|
|
|
+ msg(player, "§2 - list §rLists all clans");
|
|
|
+ msg(player, "");
|
|
|
msg(player, "§2 - create <name> <tag> §rCreates a clan. Costs §64096 §rsnuvis.");
|
|
|
+ msg(player, "§2 - invite <name> §rInvites a player");
|
|
|
+ msg(player, "§2 - accept <id/name/tag> §rAccepts an invitation");
|
|
|
+ msg(player, "");
|
|
|
msg(player, "§2 - kick <name> §rKicks a player");
|
|
|
msg(player, "§2 - leader <name> §rPromote to clan-leader");
|
|
|
msg(player, "§2 - mod <name> §rPromote to clan-mod");
|
|
|
msg(player, "§2 - degrade <name> §rDemote a clan-mod");
|
|
|
msg(player, "§2 - leave §rLeave a clan");
|
|
|
- msg(player, "§2 - disband §rDisband a clan");
|
|
|
- msg(player, "§2 - rename <name> <tag> §rRenames a clan");
|
|
|
+ msg(player, "");
|
|
|
+ msg(player, "§2 - rename <name> <tag> §rRenames a clan. Costs §664 §rsnuvis.");
|
|
|
msg(player, "§2 - setspawn §rSets a clan-spawn");
|
|
|
msg(player, "§2 - spawn §rTeleports to clan-spawn");
|
|
|
- msg(player, "§2 - msg <message> §rSends a clan-message");
|
|
|
- msg(player, "§2 - mail <message> §rSends a clan-mail");
|
|
|
- msg(player, "§2 - shout <message> §rSends a message to all online players");
|
|
|
+ msg(player, "§2 - disband §rDisband a clan");
|
|
|
+ msg(player, "");
|
|
|
msg(player, "§2 - deposit <money> §rDeposit money to the clan account");
|
|
|
msg(player, "§2 - withdraw <money> §rWithdraw money from the clan account");
|
|
|
+ msg(player, "§2 - msg <message> §rSends a clan-message");
|
|
|
+ msg(player, "§2 - mail <message> §rSends a clan-mail");
|
|
|
+ msg(player, "§2 - shout <message> §rSends a message to all online players. Costs §664 §rsnuvis.");
|
|
|
msg(player, "§2 - party §rInvites all online members to a party");
|
|
|
- msg(player, "§2 - list §rLists all clans");
|
|
|
goto("wait");
|
|
|
}
|
|
|
arg0 = text.toLowerCase(list.getIndex(args, 0));
|
|
@@ -7320,11 +7377,11 @@ if(arg0 == "shout") {
|
|
|
goto("wait");
|
|
|
}
|
|
|
clan_id = player.getClanId(player);
|
|
|
- if(clan.getMoney(clan_id) < 10) {
|
|
|
- msg.prefix(player, prefix_clan, "Your clan needs 10 snuvis.");
|
|
|
+ if(clan.getMoney(clan_id) < 64) {
|
|
|
+ msg.prefix(player, prefix_clan, "Your clan needs 64 snuvis.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
- clan.subMoney(clan_id, 10);
|
|
|
+ clan.subMoney(clan_id, 64);
|
|
|
msg.prefix("online", prefix_clan, text.concat(clan.getTag(clan_id), ": ", text.concatList(args, " ", 1, size - 1)));
|
|
|
goto("wait");
|
|
|
}
|
|
@@ -7879,7 +7936,7 @@ goto("wait");
|
|
|
if(size == 0) {
|
|
|
@world_syntax
|
|
|
msg.prefix(player, prefix_world, "/world ...");
|
|
|
- msg(player, "§b - info <world> §rShows info about a world");
|
|
|
+ msg(player, "§b - info §rShows info about a world");
|
|
|
msg(player, "§b - tp <world> [player] §rTeleports a player to a world");
|
|
|
msg(player, "§b - list §rShows all loaded worlds");
|
|
|
msg(player, "§b - setspawn §rSets the world's spawn");
|
|
@@ -8478,6 +8535,7 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, command.newHelpLiteral("loom"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("games"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("mails"));
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("mobarena"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("perms"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("playerdata"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("pumpkin"));
|
|
@@ -8855,18 +8913,18 @@ function setCommandHelps() {
|
|
|
help = command.newHelp("home", "home");
|
|
|
//home set
|
|
|
helpArg0 = command.newHelpLiteral("set");
|
|
|
- command.addHelpChild(helpArg0, command.newHelpString("home", false));
|
|
|
+ command.addHelpChild(helpArg0, command.newHelpString("name", false));
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
//home delete
|
|
|
helpArg0 = command.newHelpLiteral("delete");
|
|
|
- command.addHelpChild(helpArg0, command.newHelpString("home", false));
|
|
|
+ command.addHelpChild(helpArg0, command.newHelpString("name", false));
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
//home list
|
|
|
helpArg0 = command.newHelpLiteral("list");
|
|
|
command.addHelpChild(helpArg0, command.newHelpSpecial("Player", "player", "home.other"));
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
//home <name>
|
|
|
- helpArg0 = command.newHelpString("home", false);
|
|
|
+ helpArg0 = command.newHelpString("name", false);
|
|
|
command.addHelpChild(helpArg0, command.newHelpSpecial("Player", "player", "home.other"));
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
command.addHelp(help);
|
|
@@ -9045,6 +9103,10 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, command.newHelpLiteral("reset", "mail.reset"));
|
|
|
command.addHelp(help);
|
|
|
|
|
|
+ help = command.newHelp("entities", "entities");
|
|
|
+ command.addHelpChild(help, command.newHelpString("world", false));
|
|
|
+ command.addHelp(help);
|
|
|
+
|
|
|
help = command.newHelp("playtime", "playtime");
|
|
|
//playtime [player]
|
|
|
command.addHelpChild(help, command.newHelpSpecial("Player", "player"));
|
|
@@ -9165,10 +9227,8 @@ function setCommandHelps() {
|
|
|
command.addHelp(help);
|
|
|
|
|
|
help = command.newHelp("world", "world");
|
|
|
- //world info <world>
|
|
|
- helpArg0 = command.newHelpLiteral("info");
|
|
|
- command.addHelpChild(helpArg0, command.newHelpString("world", false));
|
|
|
- command.addHelpChild(help, helpArg0);
|
|
|
+ //world info
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("info"));
|
|
|
//world tp <world> [player]
|
|
|
helpArg0 = command.newHelpLiteral("tp");
|
|
|
helpArg1 = command.newHelpString("world", false);
|
|
@@ -9906,11 +9966,16 @@ goto("wait");
|
|
|
|
|
|
function tpBottom(player) {
|
|
|
player_loc = entity.getLocation(player);
|
|
|
+ entity.teleport($p, loc.new(world.get("overworld"), 204, 69, 259));
|
|
|
+ waitfor(5);
|
|
|
y = loc.getY(player_loc);
|
|
|
- while(block.isAir(player_loc)) {
|
|
|
+ while(y > 0 && block.isAir(player_loc)) {
|
|
|
loc.setY(player_loc, y);
|
|
|
y--;
|
|
|
- }
|
|
|
+ }
|
|
|
+ if(y <= 0) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
loc.addY(player_loc, 1);
|
|
|
entity.teleport(player, player_loc);
|
|
|
}
|