bugfixes

codelines.txt

@@ -1,7 +1,4 @@
-code_lines = 0;
-sumUpDirectory(file.new("scripts/Archiv"));
-msg("dev", "Im Archiv liegen ", text.number(code_lines), " Zeilen an Code.");
-
+all_lines = 0;
 code_lines = 0;
 sumUpDirectory(file.new("scripts/minigames"));
 sumUpDirectory(file.new("scripts/story"));
@@ -14,7 +11,20 @@ sumUpFile(file.new("scripts/endscript.txt"));
 sumUpFile(file.new("scripts/pre_generate.txt"));
 sumUpFile(file.new("scripts/startcommands.txt"));
 sumUpFile(file.new("scripts/startscript.txt"));
-msg("dev", "Es existieren ", text.number(code_lines), " aktive Zeilen an Code.");
+msg("dev", "Active: ", text.number(code_lines), " lines.");
+
+code_lines = 0;
+sumUpDirectory(file.new("scripts/Archiv"));
+msg("dev", "Archive: ", text.number(code_lines), " lines.");
+
+code_lines = 0;
+sumUpDirectory(file.new("scripts/dev"));
+msg("dev", "Development: ", text.number(code_lines), " lines.");
+
+code_lines = 0;
+sumUpDirectory(file.new("scripts/configs"));
+msg("dev", "Configs: ", text.number(code_lines), " lines.");
+msg("dev", "Sum: ", text.number(all_lines), " lines.");
 term();
 
 function sumUpDirectory(dir) {
@@ -32,6 +42,7 @@ function sumUpDirectory(dir) {
 
 function sumUpFile(file) {
 	$code_lines += getLines(file);
+	$all_lines += $code_lines;
 }
 
 function getLines(file) {

minigames/among_us/among_us.txt

@@ -4487,35 +4487,50 @@ function assignSeat(player) {
 	for(i = 0; i < 10; i++) {
 		if($seat_array[i] == null) {
 			entity.teleport(player, $lobbyspawnloc);
-			loc = list.getIndex($seat_locs, i);
-			while(entity == null) {
-				entity = entity.spawn("km:nobody", loc.mod(loc, 0.5, 0, 0.5), "{NoGravity:true}");
-			}
-			$seat_array[i] = player.getUuid(player);
-			map.add($seat_map, player, entity);
-			entity.mount(player, entity);
-			list.add($seat_list, player);
-			sgoto(60, "sgoto_leaveSeat");
+			player_uuid = player.getUuid(player);
+			$seat_array[i] = player_uuid;
+			map.add($seat_map_index, player_uuid, i);
+			list.add($seat_list_join, player_uuid);
+			sgoto(10, "lobby_join_seat");
 			return;
 		}
 	}
 }
 
-@sgoto_leaveSeat
-player = list.getIndex(seat_list, 0);
-list.removeIndex(seat_list, 0);
-leaveSeat(player);
+@lobby_join_seat
+player_uuid = list.getIndex(seat_list_join, 0);
+list.removeIndex(seat_list_join, 0);
+i = map.get(seat_map_index, player_uuid);
+loc = list.getIndex(seat_locs, i);
+ent = entity.spawn("km:nobody", loc.mod(loc, 0.5, 0, 0.5), "{NoGravity:true}");
+map.add(seat_map, player_uuid, ent);
+player = player.get(player_uuid);
+if(player != null) {
+	entity.mount(player, ent);
+	list.add(seat_list_leave, player_uuid);
+	sgoto(60, "lobby_leave_seat");
+}
 goto("simplelobby");
 
-function leaveSeat(player) {
-	uuid = player.getUuid(player);
+@lobby_leave_seat
+player_uuid = list.getIndex(seat_list_leave, 0);
+list.removeIndex(seat_list_leave, 0);
+leaveSeat(player_uuid);
+goto("simplelobby");
+
+function leaveSeat(player_or_uuid) {
+	if(isPlayer(player_or_uuid)) {
+		player_uuid = player.getUuid(player_or_uuid);
+	} else {
+		player_uuid = player_or_uuid;
+	}
 	for(i = 0; i < 10; i++) {
-		if($seat_array[i] == uuid) {
+		if($seat_array[i] == player_uuid) {
 			$seat_array[i] = null;
-			ent = map.get($seat_map, player);
+			ent = map.get($seat_map, player_uuid);
 			if(ent != null) {
 				entity.remove(ent);
-				map.remove($seat_map, player);
+				map.remove($seat_map, player_uuid);
 			}
 		}
 	}

minigames/among_us/among_us_map1.txt

@@ -44,8 +44,10 @@ amount_long_max = 6;
 
 seat_array = array.new(10);
 seat_map = map.new();
+seat_map_index = map.new();
 seat_locs = list.new();
-seat_list = list.new();
+seat_list_join = list.new();
+seat_list_leave = list.new();
 list.add(seat_locs, loc.new(gamesworld, 902, 84, 943));
 list.add(seat_locs, loc.new(gamesworld, 903, 84, 943));
 list.add(seat_locs, loc.new(gamesworld, 904, 84, 943));

system/chestshops.txt

@@ -429,8 +429,4 @@ function shop.isOwner(player, sign_loc) {
 		return owner_player_id == player.getId(player);
 	}
 	return false;
-}
-
-function isAdminShop(sign_loc) {
-	return block.getSign(sign_loc, 0) == "[Admin Shop]";
 }

system/commands.txt

@@ -133,7 +133,7 @@ command.register("unmute", "Unmutes a player");
 command.register("user", "Returns infos about a user");
 command.register("vanish", "Vanishes a player");
 command.register("var", "Reads variables from a scripts");
-command.register("vote", "Show vote rewars");
+//command.register("vote", "Show vote rewars");
 command.register("voxel", "Set radius for voxel");
 command.register("warn", "Warns a player");
 command.register("warp", "Warp-Commands");
@@ -169,6 +169,7 @@ command.registerAlias("ram", "memory");
 command.registerAlias("thor", "lightning");
 
 composter_par = particle.get("composter");
+wall_signs_tag = block.getTag("minecraft:wall_signs");
 beds_tag = block.getTag("minecraft:beds");
 chest_tag = block.getTag("forge:chests");
 sign_tag = block.getTag("minecraft:signs");
@@ -394,19 +395,19 @@ vote_inv_id = inv.getId(vote_inv);
 ha_tool = read.item("km:guild_block", 1, "§cHawkeye Tool", "Hawkeye Tool");
 
 consoleCommands = set.new();
+set.add(consoleCommands, "answer");
 set.add(consoleCommands, "ban");
-set.add(consoleCommands, "tempfly");
-set.add(consoleCommands, "silentban");
-set.add(consoleCommands, "tempban");
-set.add(consoleCommands, "unban");
 set.add(consoleCommands, "kick");
-set.add(consoleCommands, "silentkick");
-set.add(consoleCommands, "say");
-set.add(consoleCommands, "list");
 set.add(consoleCommands, "lastseen");
-set.add(consoleCommands, "start");
+set.add(consoleCommands, "list");
 set.add(consoleCommands, "msg");
-set.add(consoleCommands, "answer");
+set.add(consoleCommands, "say");
+set.add(consoleCommands, "silentban");
+set.add(consoleCommands, "silentkick");
+set.add(consoleCommands, "start");
+set.add(consoleCommands, "tempban");
+set.add(consoleCommands, "tempfly");
+set.add(consoleCommands, "unban");
 
 databank.workerExecute(databank.prepare("CREATE TABLE IF NOT EXISTS friends (player_id INT NOT NULL, friend_id INT NOT NULL, time BIGINT NOT NULL, PRIMARY KEY (player_id, friend_id), FOREIGN KEY (player_id) REFERENCES minecraft.players(id) ON DELETE RESTRICT);"));
 databank.workerExecute(databank.prepare("CREATE TABLE IF NOT EXISTS logoutdata (player_id INT NOT NULL PRIMARY KEY, logouttime BIGINT, FOREIGN KEY (player_id) REFERENCES minecraft.players(id) ON DELETE RESTRICT);"));
@@ -509,6 +510,11 @@ if(event == "block_click") {
 		goto("wait");
 	}
 	if(block.hasTag(chest_tag, block)) {
+		sign_loc = loc.mod(block_loc, 0, 1, 0);
+		if(isAWallSign(sign_loc) && isAdminShop(sign_loc)) {
+			cancel = true;
+			goto("wait");
+		}
 		if(plot.check(block_loc, player, 16, true)) {
 			cancel = false;
 			goto("wait");
@@ -1695,9 +1701,9 @@ var = script.getVar(script, var_name);
 msg.prefix(player, "§dScript", concat(var_name, " = ", var));
 goto("wait");
 
-@vote
-inv.open(vote_inv, player, concat("Your vote points: §6", text.number(player.getVotePoints(player))));
-goto("wait");
+//@vote
+//inv.open(vote_inv, player, concat("Your vote points: §6", text.number(player.getVotePoints(player))));
+//goto("wait");
 
 @voxel
 if(size < 1) {
@@ -7693,6 +7699,10 @@ function inv.show(from_player, to_player) {
 	inv.open(inv, to_player, concat("Inventory of ", player.getName(from_player)));
 }
 
+function isAWallSign(location) {
+	return block.hasTag($wall_signs_tag, block.get(location));
+}
+
 //--------------------------------------------------
 //Databank-Utils
 //--------------------------------------------------
@@ -7955,7 +7965,7 @@ function setCommandHelps() {
 	commandhelp.add("lag");
 	commandhelp.add("live");
 	commandhelp.add("hack");
-	commandhelp.add("vote");
+	//commandhelp.add("vote");
 	
 	commandhelp.addChildPlayer("mute");
 	commandhelp.addChildPlayer("unmute");

utils/u_general.txt

@@ -311,6 +311,10 @@ function ranking.getSecPoints(rankingtable, player_or_id) {
 	return sec_points;
 }
 
+function isAdminShop(sign_loc) {
+	return block.getSign(sign_loc, 0) == "[Admin Shop]";
+}
+
 //--------------------------------------------------
 //World-Utils
 //--------------------------------------------------