|
@@ -261,6 +261,7 @@ invseeids = set.new();
|
|
|
ride_set = set.new();
|
|
|
fields = set.new();
|
|
|
vanish_set = set.new();
|
|
|
+skip_night_set = set.new();
|
|
|
|
|
|
butcher_set = set.new();
|
|
|
set.add(butcher_set, "zombie");
|
|
@@ -415,6 +416,12 @@ inv.setItem(jailmenu, 6, ironbars);
|
|
|
inv.setItem(jailmenu, 7, ironbars);
|
|
|
inv.setItem(jailmenu, 8, ironbars);
|
|
|
|
|
|
+skip_night_inv = inv.new("002020200");
|
|
|
+inv.setItem(skip_night_inv, 0, read.item("km:check_green", 1, "§fYes"));
|
|
|
+inv.setItem(skip_night_inv, 1, read.item("km:gem_stone", 1, "§fI don't care"));
|
|
|
+inv.setItem(skip_night_inv, 2, read.item("km:cross_red", 1, "§fNo"));
|
|
|
+skip_night_inv_id = inv.getId(skip_night_inv);
|
|
|
+
|
|
|
consoleCommands = set.new();
|
|
|
set.add(consoleCommands, "ban");
|
|
|
set.add(consoleCommands, "tempfly");
|
|
@@ -436,6 +443,8 @@ databank.workerExecute(databank.prepare("CREATE TABLE IF NOT EXISTS tipps (tipp_
|
|
|
databank.workerExecute(databank.prepare("CREATE TABLE IF NOT EXISTS plotranks (plot_id INT NOT NULL, player_id INT NOT NULL, rank VARCHAR(10), PRIMARY KEY (plot_id, player_id), FOREIGN KEY (player_id) REFERENCES minecraft.players(id) ON DELETE RESTRICT);"));
|
|
|
databank.workerExecute(databank.prepare("CREATE TABLE IF NOT EXISTS homes (player_id INT NOT NULL, name VARCHAR(20) NOT NULL, world_name VARCHAR(20) NOT NULL, x DOUBLE NOT NULL, y DOUBLE NOT NULL, z DOUBLE NOT NULL, yaw DOUBLE NOT NULL, pitch DOUBLE NOT NULL, PRIMARY KEY (player_id, name), FOREIGN KEY (player_id) REFERENCES minecraft.players(id) ON DELETE RESTRICT);"));
|
|
|
|
|
|
+last_skip_night = 0;
|
|
|
+skip_night_started = false;
|
|
|
jail_loop_active = false;
|
|
|
afk_loop_active = false;
|
|
|
|
|
@@ -676,6 +685,49 @@ if(event == "inv_click") {
|
|
|
safeGiveItemPlayer(player, item);
|
|
|
inv.setItem(inv, inv_slot, read.item("minecraft:air"));
|
|
|
inv.update(player);
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ if(inv_id == skip_night_inv_id) {
|
|
|
+ world = world.getOverWorld();
|
|
|
+ world_time = world.getTime(world);
|
|
|
+ while(world_time >= 24000) {
|
|
|
+ world_time -= 24000;
|
|
|
+ }
|
|
|
+ if(world_time <= 12500) {
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ player_uuid = player.getUuid(player);
|
|
|
+ if(set.contains(skip_night_set, player_uuid)) {
|
|
|
+ msg.prefix(player, prefix_commands, "Already voted.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ set.add(skip_night_set, player_uuid);
|
|
|
+ if(!skip_night_started) {
|
|
|
+ world.addTimedStatus(world, 49, 600, "Skip night?");
|
|
|
+ sendMessageToWorld(world, "[§6Commands§r] Skip night? Vote within 30 seconds.");
|
|
|
+ skip_night_counter = 30;
|
|
|
+ skip_night_yes = 0;
|
|
|
+ skip_night_no = 0;
|
|
|
+ skip_night_no_care = 0;
|
|
|
+ skip_night_started = true;
|
|
|
+ sgoto(20, "skip_night_loop");
|
|
|
+ }
|
|
|
+ if(inv_slot == 0) {
|
|
|
+ skip_night_yes++;
|
|
|
+ inv.close(player);
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ if(inv_slot == 1) {
|
|
|
+ skip_night_no_care++;
|
|
|
+ inv.close(player);
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ if(inv_slot == 2) {
|
|
|
+ skip_night_no++;
|
|
|
+ inv.close(player);
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ goto("wait");
|
|
|
}
|
|
|
if(inv_name == "Skills") {
|
|
|
if(item.getType(item) == "minecraft:air") {
|
|
@@ -778,7 +830,7 @@ if(event == "inv_click") {
|
|
|
}
|
|
|
amount = skill.getAmount(player, "skill.block_up");
|
|
|
if(amount > 0) {
|
|
|
- status.addTimed(player, 50, 1200, "Block Up");
|
|
|
+ status.addTimed(player, 51, 1200, "Block Up");
|
|
|
data.setTimer(player, "block_up", 1200);
|
|
|
new_amount = amount - 1;
|
|
|
skill.setAmount(player, "skill.block_up", new_amount);
|
|
@@ -794,7 +846,7 @@ if(event == "inv_click") {
|
|
|
}
|
|
|
amount = skill.getAmount(player, "skill.block_down");
|
|
|
if(amount > 0) {
|
|
|
- status.addTimed(player, 50, 1200, "Block Down");
|
|
|
+ status.addTimed(player, 52, 1200, "Block Down");
|
|
|
data.setTimer(player, "block_down", 1200);
|
|
|
new_amount = amount - 1;
|
|
|
skill.setAmount(player, "skill.block_down", new_amount);
|
|
@@ -862,6 +914,26 @@ if(event == "function_key") {
|
|
|
skill.showAll(player);
|
|
|
goto("wait");
|
|
|
}
|
|
|
+ if(key == 3) {
|
|
|
+ world_time = world.getTime(world.getOverWorld());
|
|
|
+ while(world_time >= 24000) {
|
|
|
+ world_time -= 24000;
|
|
|
+ }
|
|
|
+ if(world_time <= 12500) {
|
|
|
+ msg.prefix(player, prefix_commands, "Only during night possible.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ if(set.contains(skip_night_set, player_uuid)) {
|
|
|
+ msg.prefix(player, prefix_commands, "Already voted.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ if(time.getMillis() - last_skip_night < 420000) {
|
|
|
+ msg.prefix(player, prefix_commands, "Only once per night possible.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ inv.open(skip_night_inv, player, "Skip Night?");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(event == "player_data_tick") {
|
|
@@ -872,6 +944,28 @@ if(event == "player_data_tick") {
|
|
|
}
|
|
|
goto("wait");
|
|
|
|
|
|
+@skip_night_loop
|
|
|
+skip_night_counter--;
|
|
|
+if(skip_night_counter == 0) {
|
|
|
+ world = world.getOverWorld();
|
|
|
+ sendMessageToWorld(world, "[§6Commands§r] Skip night results:");
|
|
|
+ sendMessageToWorld(world, concat("§e - §rYes: §e", text.number(skip_night_yes)));
|
|
|
+ sendMessageToWorld(world, concat("§e - §rNo: §e", text.number(skip_night_no)));
|
|
|
+ sendMessageToWorld(world, concat("§e - §rI don't care: §e", text.number(skip_night_no_care)));
|
|
|
+ if(skip_night_yes > skip_night_no) {
|
|
|
+ world.setTime(world, 0);
|
|
|
+ }
|
|
|
+ set.clear(skip_night_set);
|
|
|
+ last_skip_night = time.getMillis();
|
|
|
+ sgoto(8400, "reset_skip_night");
|
|
|
+}
|
|
|
+sgoto(20, "skip_night_loop");
|
|
|
+goto("wait");
|
|
|
+
|
|
|
+@reset_skip_night
|
|
|
+skip_night_started = false;
|
|
|
+goto("wait");
|
|
|
+
|
|
|
@skills
|
|
|
skill.showAll(player);
|
|
|
goto("wait");
|
|
@@ -3404,13 +3498,13 @@ if(p_uuid == null) {
|
|
|
msg.prefix(sender, prefix_commands, "There is no one you could answer.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
-message = text.replace(text.concatList2(args, " ", 0, size - 1), "&", "§");
|
|
|
+message = text.replace(text.concatList(args, " ", 0, size - 1), "&", "§");
|
|
|
if(text.startsWith(message, "https://", 0)) {
|
|
|
message = text.link(message, message);
|
|
|
}
|
|
|
if(player.getId(p_uuid) == 18) {
|
|
|
- msg(sender, text.concat2(concat("§6[ -> §cSERVER§6] "), message));
|
|
|
- msg("SERVER", text.concat2(concat("§6[§c", sender_name, "§6] "), message));
|
|
|
+ msg(sender, "§6[ -> §cSERVER§6] ", message);
|
|
|
+ msg("SERVER", concat("§6[§c", sender_name), "§6] ", message);
|
|
|
} else {
|
|
|
p = player.get(p_uuid);
|
|
|
if(p == null) {
|
|
@@ -3439,21 +3533,21 @@ if(p_uuid == null) {
|
|
|
msg.prefix(sender, prefix_commands, "Unknown player.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
-message = text.replace(text.concatList2(args, " ", 1, size - 1), "&", "§");
|
|
|
+message = text.replace(text.concatList(args, " ", 1, size - 1), "&", "§");
|
|
|
if(text.startsWith(message, "https://", 0)) {
|
|
|
message = text.link(message, message);
|
|
|
}
|
|
|
if(text.toUpperCase(p_name) == "SERVER") {
|
|
|
- msg("SERVER", text.concat2(concat("§6[§c", sender_name, "§6] "), message));
|
|
|
- msg(sender, text.concat2(concat("§6[ -> §cSERVER§6] "), message));
|
|
|
+ msg("SERVER", concat("§6[§c", sender_name), "§6] ", message);
|
|
|
+ msg(sender, "§6[ -> §cSERVER§6] ", message);
|
|
|
} else {
|
|
|
p = read.player(p_name);
|
|
|
if(p == null) {
|
|
|
msg.prefix(sender, prefix_commands, "This player is not online.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
- msg(p, text.concat2(concat("§6[§c", sender_name, "§6] "), message));
|
|
|
- msg(sender, text.concat2(concat("§6[ -> §c", player.getName(p), "§6] "), message));
|
|
|
+ msg(p, concat("§6[§c", sender_name), "§6] ", message);
|
|
|
+ msg(sender, concat("§6[ -> §c", player.getName(p)), "§6] ", message);
|
|
|
}
|
|
|
player_uuid = player.getUuid(sender);
|
|
|
map.add(answer_map, p_uuid, player_uuid);
|
|
@@ -3868,7 +3962,6 @@ if(size == 0) {
|
|
|
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 - degrade <player> [id] §rDemote a player");
|
|
|
msg(player, "§d - raise §rRaises a plot to a city");
|
|
|
msg(player, "§d - sell <price> §rSells a sub-plot");
|
|
|
if(perm.has(player, "plot.moreinfo")) {
|
|
@@ -4214,74 +4307,6 @@ if(arg0 == "chest") {
|
|
|
msg.prefix(player, prefix_plot, concat(p_name, " can now open chests."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
-if(arg0 == "degrade") {
|
|
|
- if(size < 2) {
|
|
|
- msg.prefix(player, prefix_commands, "/plot degrade <player> [plot_id]");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- p_name = list.getIndex(args, 1);
|
|
|
- p_uuid = player.getUuid(p_name);
|
|
|
- if(p_uuid == null) {
|
|
|
- msg.prefix(player, prefix_plot, "This player has never been online.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- p_name = player.getName(p_uuid);
|
|
|
- location = entity.getLocation(player);
|
|
|
- world = loc.getWorld(location);
|
|
|
- if(size == 2) {
|
|
|
- plot_list = plot.get(location);
|
|
|
- amount = list.getSize(plot_list);
|
|
|
- if(amount == 0) {
|
|
|
- msg.prefix(player, prefix_plot, "You aren't on a plot.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- plot = list.getIndex(plot_list, 0);
|
|
|
- if(amount > 1) {
|
|
|
- msg.prefix(player, prefix_plot, "Multiple plots present:");
|
|
|
- for(i = 0; i < amount; i++) {
|
|
|
- plot = list.getIndex(plot_list, i);
|
|
|
- plot_id = plot.getId(plot);
|
|
|
- msg(player, text.click(" [§cSelect§r] ", concat("/plot degrade ", p_name, " ", plot_id)), concat("#", text.number(plot_id), " ", plot.getType(plot), " §6", plot.getName(plot), " §r", plot.getLeaderName(plot)));
|
|
|
- }
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- } else {
|
|
|
- if(size != 3) {
|
|
|
- msg.prefix(player, prefix_commands, "/plot degrade <player> [plot_id]");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- plot_id = list.getIndex(args, 2);
|
|
|
- plot = plot.getFromId(plot_id, world);
|
|
|
- if(plot == null) {
|
|
|
- msg.prefix(player, prefix_plot, "Unknown plot or not in this world.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- }
|
|
|
- player_id = player.getId(player);
|
|
|
- if(!perm.has(player, "plot.other")) {
|
|
|
- if(!world.canUsePlots(world)) {
|
|
|
- msg.prefix(player, prefix_perms, "You have no permission for this in this world.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- if(!plot.isLeader(plot, player_id)) {
|
|
|
- msg.prefix(player, prefix_plot, "You aren't the plot leader.");
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- }
|
|
|
- p_id = player.getId(p_uuid);
|
|
|
- if(plot.isMod(plot, p_id)) {
|
|
|
- plot.removeRank(plot, p_id);
|
|
|
- msg.prefix(player, prefix_plot, concat(p_name, " is no longer a plot mod."));
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- if(plot.canOpenChests(plot, p_id)) {
|
|
|
- plot.removeRank(plot, p_id);
|
|
|
- msg.prefix(player, prefix_plot, concat(p_name, " can no longer open chests."));
|
|
|
- goto("wait");
|
|
|
- }
|
|
|
- msg.prefix(player, prefix_plot, "This player is not a plot mod or can't open chests.");
|
|
|
- goto("wait");
|
|
|
-}
|
|
|
if(arg0 == "remove") {
|
|
|
location = entity.getLocation(player);
|
|
|
world = loc.getWorld(location);
|
|
@@ -4694,6 +4719,10 @@ if(arg0 == "create" || arg0 == "create3d") {
|
|
|
if(list.getSize(list) > 0) {
|
|
|
city_plot = list.getIndex(list, 0);
|
|
|
if(plot.isCity(city_plot)) {
|
|
|
+ if(!plot.isLeader(city_plot, player_id) && !plot.isMod(city_plot, player_id)) {
|
|
|
+ msg.prefix(player, prefix_plot, "You aren't a plot leader or mod.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
city_id = plot.getId(city_plot);
|
|
|
if(!loc.hasPlotId(loc1, city_id)) {
|
|
|
msg.prefix(player, prefix_plot, "The sub plot needs to be surrounded by the city.");
|
|
@@ -4970,18 +4999,20 @@ if(arg0 == "moreinfo" || arg0 == "mi") {
|
|
|
}
|
|
|
owners = "";
|
|
|
owners_list = plot.getOwners(plot);
|
|
|
- for(i = 0; i < list.getSize(owners_list); i++) {
|
|
|
- owners = concat(owners, "/", player.getName(list.getIndex(owners_list, i)));
|
|
|
- }
|
|
|
+ copy_list = list.copy(owners_list);
|
|
|
plot_id = plot.getId(plot);
|
|
|
- msg.prefix(player, prefix_plot, concat("#", text.number(plot_id), " ", plot.getType(plot), " §6", plot.getName(plot), " §r", owners));
|
|
|
+ msg.prefix(player, prefix_plot, concat("#", text.number(plot_id), " ", plot.getType(plot), " §6", plot.getName(plot)));
|
|
|
msg(player, " §dWorld: §r", world.getName(world));
|
|
|
msg(player, " §dPos1: §r", plot.getMinX(plot), " / ", plot.getMinY(plot), " / ", plot.getMinZ(plot));
|
|
|
msg(player, " §dPos2: §r", plot.getMaxX(plot), " / ", plot.getMaxY(plot), " / ", plot.getMaxZ(plot));
|
|
|
- if(leader == "") {
|
|
|
- leader = "-";
|
|
|
+
|
|
|
+ leader_name = plot.getLeaderName(plot);
|
|
|
+ if(leader_name == "") {
|
|
|
+ leader_name = "-";
|
|
|
}
|
|
|
- msg(player, " §dLeader: §r", leader);
|
|
|
+ msg(player, " §dLeader: §r", leader_name);
|
|
|
+ list.remove(copy_list, player.getUuid(leader_name));
|
|
|
+
|
|
|
mods_list = plot.getMods(plot);
|
|
|
mods_amount = list.getSize(mods_list);
|
|
|
if(mods_amount == 0) {
|
|
@@ -4991,6 +5022,8 @@ if(arg0 == "moreinfo" || arg0 == "mi") {
|
|
|
mods_string = "";
|
|
|
while(hasNext(iter)) {
|
|
|
p_name = player.getNameFromId(next(iter));
|
|
|
+ p_uuid = player.getUuid(p_name);
|
|
|
+ list.remove(copy_list, p_uuid);
|
|
|
if(mods_string == "") {
|
|
|
mods_string = p_name;
|
|
|
} else {
|
|
@@ -4999,6 +5032,24 @@ if(arg0 == "moreinfo" || arg0 == "mi") {
|
|
|
}
|
|
|
}
|
|
|
msg(player, " §dMods: §r", mods_string);
|
|
|
+
|
|
|
+ members_amount = list.getSize(copy_list);
|
|
|
+ if(members_amount == 0) {
|
|
|
+ members_string = "-";
|
|
|
+ } else {
|
|
|
+ iter = list.iterator(copy_list);
|
|
|
+ members_string = "";
|
|
|
+ while(hasNext(iter)) {
|
|
|
+ p_name = player.getName(next(iter));
|
|
|
+ if(members_string == "") {
|
|
|
+ members_string = p_name;
|
|
|
+ } else {
|
|
|
+ members_string = concat(members_string, " / ", p_name);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ msg(player, " §dMembers: §r", members_string);
|
|
|
+
|
|
|
chests_list = plot.getChestRanks(plot);
|
|
|
chests_amount = list.getSize(chests_list);
|
|
|
if(chests_amount == 0) {
|
|
@@ -5015,7 +5066,8 @@ if(arg0 == "moreinfo" || arg0 == "mi") {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- msg(player, " §dChest: §r", chests_string);
|
|
|
+ msg(player, " §dOnly chest: §r", chests_string);
|
|
|
+
|
|
|
flags = plot.getFlags(plot);
|
|
|
flags_true = list.new();
|
|
|
flags_false = list.new();
|
|
@@ -5147,20 +5199,20 @@ if(arg0 == "info" || arg0 == "i") {
|
|
|
plot = list.getIndex(list, i);
|
|
|
plot_id = plot.getId(plot);
|
|
|
msg(player, concat(" - #", text.number(plot_id), " ", plot.getType(plot), " §6", plot.getName(plot)));
|
|
|
- owners = "";
|
|
|
owners_list = plot.getOwners(plot);
|
|
|
- for(h = 0; h < list.getSize(owners_list); h++) {
|
|
|
- owners = concat(owners, "/", player.getName(list.getIndex(owners_list, h)));
|
|
|
- }
|
|
|
+ copy_list = list.copy(owners_list);
|
|
|
plot_id = plot.getId(plot);
|
|
|
msg(player, " §dWorld: §r", world.getName(world));
|
|
|
msg(player, " §dPos1: §r", plot.getMinX(plot), " / ", plot.getMinY(plot), " / ", plot.getMinZ(plot));
|
|
|
msg(player, " §dPos2: §r", plot.getMaxX(plot), " / ", plot.getMaxY(plot), " / ", plot.getMaxZ(plot));
|
|
|
- leader = plot.getLeaderName(plot);
|
|
|
- if(leader == "") {
|
|
|
- leader = "-";
|
|
|
- }
|
|
|
- msg(player, " §dLeader: §r", leader);
|
|
|
+
|
|
|
+ leader_name = plot.getLeaderName(plot);
|
|
|
+ if(leader_name == "") {
|
|
|
+ leader_name = "-";
|
|
|
+ }
|
|
|
+ msg(player, " §dLeader: §r", leader_name);
|
|
|
+ list.remove(copy_list, player.getUuid(leader_name));
|
|
|
+
|
|
|
mods_list = plot.getMods(plot);
|
|
|
mods_amount = list.getSize(mods_list);
|
|
|
if(mods_amount == 0) {
|
|
@@ -5170,6 +5222,8 @@ if(arg0 == "info" || arg0 == "i") {
|
|
|
mods_string = "";
|
|
|
while(hasNext(iter)) {
|
|
|
p_name = player.getNameFromId(next(iter));
|
|
|
+ p_uuid = player.getUuid(p_name);
|
|
|
+ list.remove(copy_list, p_uuid);
|
|
|
if(mods_string == "") {
|
|
|
mods_string = p_name;
|
|
|
} else {
|
|
@@ -5178,6 +5232,24 @@ if(arg0 == "info" || arg0 == "i") {
|
|
|
}
|
|
|
}
|
|
|
msg(player, " §dMods: §r", mods_string);
|
|
|
+
|
|
|
+ members_amount = list.getSize(copy_list);
|
|
|
+ if(members_amount == 0) {
|
|
|
+ members_string = "-";
|
|
|
+ } else {
|
|
|
+ iter = list.iterator(copy_list);
|
|
|
+ members_string = "";
|
|
|
+ while(hasNext(iter)) {
|
|
|
+ p_name = player.getName(next(iter));
|
|
|
+ if(members_string == "") {
|
|
|
+ members_string = p_name;
|
|
|
+ } else {
|
|
|
+ members_string = concat(members_string, " / ", p_name);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ msg(player, " §dMembers: §r", members_string);
|
|
|
+
|
|
|
chests_list = plot.getChestRanks(plot);
|
|
|
chests_amount = list.getSize(chests_list);
|
|
|
if(chests_amount == 0) {
|
|
@@ -5194,7 +5266,7 @@ if(arg0 == "info" || arg0 == "i") {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- msg(player, " §dChest: §r", chests_string);
|
|
|
+ msg(player, " §dOnly chest: §r", chests_string);
|
|
|
}
|
|
|
goto("wait");
|
|
|
}
|
|
@@ -5975,7 +6047,7 @@ msg.prefix(p, prefix_commands, concat("You can now fly for ", text.number(sec),
|
|
|
player.setFly(p, true);
|
|
|
duration = sec * 20;
|
|
|
data.setTimer(p, "fly", duration);
|
|
|
-status.addTimed(player, 50, duration, "Fly");
|
|
|
+status.addTimed(player, 53, duration, "Fly");
|
|
|
goto("wait");
|
|
|
|
|
|
@fly
|
|
@@ -8011,12 +8083,6 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(helpArg1, command.newHelpInt("id", 0, 10000));
|
|
|
command.addHelpChild(helpArg0, helpArg1);
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
- //plot degrade <name>
|
|
|
- helpArg0 = command.newHelpLiteral("degrade");
|
|
|
- helpArg1 = command.newHelpSpecial("Player", "player");
|
|
|
- command.addHelpChild(helpArg1, command.newHelpInt("id", 0, 10000));
|
|
|
- command.addHelpChild(helpArg0, helpArg1);
|
|
|
- command.addHelpChild(help, helpArg0);
|
|
|
//plot sell <price>
|
|
|
helpArg0 = command.newHelpLiteral("sell");
|
|
|
command.addHelpChild(helpArg0, command.newHelpInt("price", 1, 10000));
|