timber deployed, trapdoors, docu updated

docu_core.php

@@ -1488,19 +1488,33 @@
     <table>
         <tr>
             <th class="command">text.onlyLetters</th>
-            <th class="desc">Überprüft, ob ein Text nur Buchstaben enthält</th>
+            <th class="desc">returns true if a text has only letters</th>
         </tr>
         <tr>
             <td class="bold">Format</td>
             <td>text.onlyLetters(String)</td>
         </tr>
+    </table>
+    <table>
         <tr>
-            <td class="bold">Arguments</td>
-            <td>String</td>
+            <th class="command">text.convert</th>
+            <th class="desc">converts strings into objects</th>
         </tr>
         <tr>
-            <td class="bold">Returns</td>
-            <td>true/false</td>
+            <td class="bold">Format</td>
+            <td>text.convert(any object)</td>
+        </tr>
+        <tr>
+            <td class="bold">Info</td>
+            <td>
+				null -> null<br>
+				"null" -> null<br>
+				"true" -> true<br>
+				"false" -> false<br>
+				"\"" -> \"<br>
+				"1" -> 1.0<br>
+				"string" -> "string"
+			</td>
         </tr>
     </table>
 </section>

docu_minecraft.php

@@ -776,6 +776,26 @@
             <td>block.getDoorStatus(location)</td>
         </tr>
     </table>
+    <table>
+        <tr>
+            <th class="command">block.setTrapdoorStatus</th>
+            <th class="desc">true opens a trapdoor</th>
+        </tr>
+        <tr>
+            <td class="bold">Format</td>
+            <td>block.setTrapdoorStatus(location, boolean)</td>
+        </tr>
+    </table>
+    <table>
+        <tr>
+            <th class="command">block.getTrapdoorStatus</th>
+            <th class="desc">returns true if the trapdoor is open</th>
+        </tr>
+        <tr>
+            <td class="bold">Format</td>
+            <td>block.getTrapdoorStatus(location)</td>
+        </tr>
+    </table>
     <table>
         <tr>
             <th class="command">block.isAir</th>
@@ -798,7 +818,7 @@
     </table>
     <table>
         <tr>
-            <th class="command">block.isDoor</th>
+            <th class="command">block.isDoor (deprecated)</th>
             <th class="desc">returns true if the block at the location is a door</th>
         </tr>
         <tr>
@@ -888,6 +908,20 @@
             <td>returns null if invalid state</td>
         </tr>
     </table>
+	<table>
+        <tr>
+            <th class="command">block.break</th>
+            <th class="desc">breaks a block and drops the item</th>
+        </tr>
+        <tr>
+            <td class="bold">Format</td>
+            <td>block.break(location, entity)</td>
+        </tr>
+		<tr>
+			<td class="bold">Info</td>
+            <td>entity can be null</td>
+        </tr>
+    </table>
 </section>
 <section id="Databank">
     <table>
@@ -1916,6 +1950,20 @@
             <td>boolean true means the block before the last one</td>
         </tr>
     </table>
+	<table>
+        <tr>
+            <th class="command">loc.explode</th>
+            <th class="desc">makes an explosion at a location</th>
+        </tr>
+        <tr>
+            <td class="bold">Format</td>
+            <td>loc.explode(location, entity, radius, fire_bool, block_damage_bool)</td>
+        </tr>
+		<tr>
+			<td class="bold">Info</td>
+            <td>entity can be null</td>
+        </tr>
+    </table>
 </section>
 <section id="Read">
     <table>
@@ -2391,6 +2439,16 @@
             <td>table.get(table, args...)</td>
         </tr>
     </table>
+	<table>
+        <tr>
+            <th class="command">table.setSize</th>
+            <th class="desc">defines the pixel size of a character</th>
+        </tr>
+        <tr>
+            <td class="bold">Format</td>
+            <td>table.setSize("character", pixel_int)</td>
+        </tr>
+    </table>
 </section>
 <section id="Command">
     <table>
@@ -4280,6 +4338,16 @@
             <td class="bold">Examples</td>
             <td>array[0] = x<br>array[1] = y<br>array[2] = z</td>
         </tr>
+    </table>
+	<table>
+        <tr>
+            <th class="command">entity.getMotion</th>
+            <th class="desc">returns an array with vectors</th>
+        </tr>
+        <tr>
+            <td class="bold">Format</td>
+            <td>entity.getMotion(entity)</td>
+        </tr>
     </table>
     <table>
         <tr>

minigames/knockfight/knockfight.txt

@@ -4,7 +4,6 @@ game_short = "knock";
 event.load("player_toss");
 event.load("function_key");
 event.load("living_hurt");
-event.load("player_post_respawn");
 
 kf_skills = list.new();
 addKnockfightSkill("Speed", "km:skill44", 30);
@@ -66,43 +65,42 @@ player.giveItem(player, item);
 goto("checkgame");
 
 @living_hurt
-cancel = true;
 player_uuid = player.getUuid(player);
 player_name = player.getName(player);
 damage_type = damage.getType(damage_source);
 if(damage_type == "player") {
-	player.setSaturation(player, 5);
 	sec_player = player.getFromDamageSource(damage_source);
-	if(!player.hasMinigameId(sec_player, script_id)) {
-		goto("checkgame");
+	if(player.hasMinigameId(sec_player, script_id)) {
+		cancel = true;
+		player.setSaturation(sec_player, 5);
+		map.add(lastdamage, player_uuid, player.getUuid(sec_player));
+		list.add(resetlist, player_uuid);
+		sgoto(resettime, "resetdamager");
 	}
-	map.add(lastdamage, player_uuid, player.getUuid(sec_player));
-	list.add(resetlist, player_uuid);
-	sgoto(resettime, "resetdamager");
+	goto("checkgame");
+}
+if(damage_type == "fall") {
+	cancel = true;
 	goto("checkgame");
 }
 if(damage_type == "outOfWorld") {
+	cancel = true;
 	player_uuid = player.getUuid(player);
 	lastdamager_uuid = map.get(lastdamage, player_uuid);
-	entity.damage(player, 1000);
 	if(lastdamager_uuid == null) {
 		minigame.speakAll(gamename, concat("§6", player_name, " §rfell."));
 	} else {
 		minigame.speakAll(gamename, concat("§6", player_name, " §rwas knocked down by §6", player.getName(lastdamager_uuid), "."));
 		map.add(knockedcounter, lastdamager_uuid, map.get(knockedcounter, lastdamager_uuid) + 1);
 	}
-}
-goto("checkgame");
-
-@player_post_respawn
-entity.teleport(player, list.getIndex(startlocs, math.random(0, list.getSize(startlocs) - 1)));
-player_uuid = player.getUuid(player);
-new_lifes = map.get(lifes, player_uuid) - 1;
-map.add(lifes, player_uuid, new_lifes);
-gosub("updatedisplay");
-if(new_lifes == 0) {
-	minigame.speakAll(gamename, concat("§6", player_name, " §rhas been eliminated."));
-	goto("leavegame");
+	entity.teleport(player, list.getIndex(startlocs, math.random(0, list.getSize(startlocs) - 1)));
+	new_lifes = map.get(lifes, player_uuid) - 1;
+	map.add(lifes, player_uuid, new_lifes);
+	gosub("updatedisplay");
+	if(new_lifes == 0) {
+		minigame.speakAll(gamename, concat("§6", player_name, " §rhas been eliminated."));
+		goto("leavegame");
+	}
 }
 goto("checkgame");
 
@@ -168,6 +166,7 @@ goto("checkgame");
 
 @player_giveup
 @player_logout
+player_name = player.getName(player);
 minigame.speakAll(gamename, concat("§6", player_name, " §rhas left the game."));
 @leavegame
 script = script.getFromId(script_id);

minigames/spleef/spleef.txt

@@ -27,19 +27,22 @@ for(i = 0; i < all_size; i++) {
 
 @checkgame
 wait();
+if(event == "living_pre_hurt") {
+	if(!isPlayer(living_entity)) {
+		goto("checkgame");
+	}
+	player = living_entity;
+}
 if(player.hasMinigameId(player, script_id)) {
 	ignoreGoto(event);
 }
 goto("checkgame");
 
 @living_pre_hurt
-if(isPlayer(living_entity)) {
-	player = living_entity;
-	cancel = true;
-	if(damage.getType(damage_source) == "outOfWorld") {
-		minigame.speakAll(gamename, concat("§6", player.getName(player), " §rfell down."));
-		goto("loosegame");
-	}
+cancel = true;
+if(damage.getType(damage_source) == "outOfWorld") {
+	minigame.speakAll(gamename, concat("§6", player.getName(player), " §rfell down."));
+	goto("loosegame");
 }
 goto("checkgame");
 

startscript.txt

@@ -28,6 +28,7 @@ script.startNamed("Story", "system/story", "utils/u_general");
 script.startNamed("QuestsAdmont", "story/admont/core", "utils/u_general", "utils/u_quest");
 script.startNamed("QuestsSchiffbruch", "story/schiffbruch/core", "utils/u_general", "utils/u_quest");
 script.startNamed("Workberries", "system/workberries");
+script.startNamed("Timber", "system/timber", "utils/u_general");
 script.startNamed("Gamerules", "system/gamerules");
 script.startNamed("Scheduler", "system/scheduler", "utils/u_general");
 

story/admont/core.txt

@@ -53,9 +53,9 @@ if(entity_name == "Zauberlehrling") {
 }
 if(entity_name == "Felsmagier") {
 	if(time.getMillis() - map.getOrDefault(timestamp, player.getUuid(player), 0) < 120000) { //2 Minutes
-		skill.showShop(player, "skill.subcu_inv", "skill.comeback", "skill.head_human", "skill.head_monster", "skill.fly10min", "skill.grow", "skill.haste", "skill.speed", "skill.jump_boost", "skill.dolphin", "skill.block_up", "skill.block_down", null, null, null, null, null, null);
+		skill.showShop(player, "skill.subcu_inv", "skill.comeback", "skill.head_human", "skill.head_monster", "skill.fly10min", "skill.grow", "skill.haste", "skill.speed", "skill.jump_boost", "skill.dolphin", "skill.block_up", "skill.block_down", "skill.timber", null, null, null, null, null);
 	} else {
-		skill.showShop(player, "skill.subcu_inv", "skill.comeback", "skill.head_human", "skill.head_monster", "skill.fly10min", "skill.grow", "skill.haste", "skill.speed", "skill.jump_boost", "skill.dolphin", "skill.block_up", "skill.block_down", null, null, null, null, null, null);
+		//skill.showShop(player, "skill.subcu_inv", "skill.comeback", "skill.head_human", "skill.head_monster", "skill.fly10min", "skill.grow", "skill.haste", "skill.speed", "skill.jump_boost", "skill.dolphin", "skill.block_up", "skill.block_down", "skill.timber", null, null, null, null, null);
 		msg.prefix(player, "§dFelsmagier", "Du musst zuerst ein paar Aufgaben für mich erledigen. Finde meinen Zauberlehrling, der hilft dir weiter.");
 	}
 	goto("wait");

system/commands.txt

@@ -757,6 +757,22 @@ if(event == "inv_click") {
 				msg.prefix(player, prefix_skill, "You can't use this in this world.");
 				goto("wait");
 			}
+			if(tech_name == "skill.timber") {
+				duration = data.getTimer(player, "timber");
+				if(duration > 0) {
+					msg.prefix(player, prefix_skill, "Skill already active.");
+					goto("wait");
+				}
+				amount = skill.getAmount(player, "skill.timber");
+				if(amount > 0) {
+					status.addTimed(player, 50, 1200, "Timber");
+					data.setTimer(player, "timber", 1200);
+					new_amount = amount - 1;
+					skill.setAmount(player, "skill.timber", new_amount);
+					msg.prefix(player, prefix_skill, concat("Used Timber. New amount: ", text.number(new_amount)));
+				}
+				goto("wait");
+			}
 			if(tech_name == "skill.fly10min") {
 				duration = data.getTimer(player, "fly");
 				if(duration > 0) {
@@ -2674,6 +2690,7 @@ if(size != 1) {
 	msg(sender, " - story");
 	msg(sender, " - survival");
 	msg(sender, " - ticket");
+	msg(sender, " - timber");
 	msg(sender, " - voxel");
 	goto("wait");
 }
@@ -2787,6 +2804,13 @@ elseif(arg0 == "ticket") {
 	}
 	script.startNamed("Ticket", "system/tickets", "utils/u_general");
 }
+elseif(arg0 == "timber") {
+	script = script.get("Timber");
+	if(script != null) {
+		script.term(script);
+	}
+	script.startNamed("Timber", "system/timber", "utils/u_general");
+}
 elseif(arg0 == "story") {
 	script = script.get("Story");
 	if(script != null) {
@@ -7699,6 +7723,7 @@ function setCommandHelps() {
 	command.addHelpChild(help, command.newHelpLiteral("story"));
 	command.addHelpChild(help, command.newHelpLiteral("survival"));
 	command.addHelpChild(help, command.newHelpLiteral("ticket"));
+	command.addHelpChild(help, command.newHelpLiteral("timber"));
 	command.addHelpChild(help, command.newHelpLiteral("voxel"));
 	command.addHelp(help);
 

system/doors.txt

@@ -1,6 +1,9 @@
 event.load("block_click");
 
 doors = list.new();
+trapdoors = list.new();
+doors_tag = block.getTag("minecraft:wooden_doors");
+trapdoors_tag = block.getTag("minecraft:wooden_trapdoors");
 
 msg("dev", "§bDoors §rloaded.");
 @wait
@@ -13,7 +16,7 @@ if(isSurvWorldName(world_name) || isStoryWorldName(world_name)) {
 goto("wait");
 
 @block_click
-if(block.isDoor(block_loc) && action == "right") {
+if(block.hasTag(doors_tag, block) && action == "right") {
 	player_spec = player.getAutoCloseDoor(player);
 	door_state_1 = block.getDoorStatus(block_loc);
 	if(!door_state_1) {
@@ -36,15 +39,36 @@ if(block.isDoor(block_loc) && action == "right") {
 			}
 		}
 	}
+	goto("wait");
+}
+if(block.hasTag(trapdoors_tag, block) && action == "right") {
+	door_state = block.getTrapdoorStatus(block_loc);
+	if(!door_state) {
+		player_spec = player.getAutoCloseDoor(player);
+		if(player_spec) {
+			list.add(trapdoors, block_loc);
+			sgoto(60, "closetrapdoor");
+		}
+	}
 }
 goto("wait");
 
 @closedoor
 doorloc = list.getIndex(doors, 0);
 list.removeIndex(doors, 0);
-if(block.isDoor(doorloc)) {
+if(block.hasTag(doors_tag, block.get(doorloc))) {
 	if(block.getDoorStatus(doorloc)) {
 		block.setDoorStatus(doorloc, false);
 	}
 }
+goto("wait");
+
+@closetrapdoor
+doorloc = list.getIndex(trapdoors, 0);
+list.removeIndex(trapdoors, 0);
+if(block.hasTag(trapdoors_tag, block.get(doorloc))) {
+	if(block.getTrapdoorStatus(doorloc)) {
+		block.setTrapdoorStatus(doorloc, false);
+	}
+}
 goto("wait");

system/gamecenter.txt

@@ -55,12 +55,12 @@ minigame.addSign("sfsign2", true, loc.new(gamesworld, -398, 157, -47), "minigame
 minigame.addSign("sfsign3", true, loc.new(gamesworld, -399, 158, -47), "minigames/sammelfieber/sammelfieber", "minigames/sammelfieber/sfmap3", false);
 minigame.addSign("buttonssign1", true, loc.new(gamesworld, -399, 158, -65), "minigames/buttons/buttons", "minigames/buttons/buttonsmap1", true);
 minigame.addSign("buttonssign2", true, loc.new(gamesworld, -398, 158, -65), "minigames/buttons/buttons", "minigames/buttons/buttonsmap2", true);
-minigame.addSign("spleefsign1", false, loc.new(gamesworld, -401, 157, -73), "minigames/spleef/spleef", "minigames/spleef/spleefmap1", false);
-minigame.addSign("spleefsign2", false, loc.new(gamesworld, -401, 157, -72), "minigames/spleef/spleef", "minigames/spleef/spleefmap2", false);
-minigame.addSign("spleefsign3", false, loc.new(gamesworld, -401, 157, -71), "minigames/spleef/spleef", "minigames/spleef/spleefmap3", false);
-minigame.addSign("knockfightsign1", false, loc.new(gamesworld, -419, 157, -40), "minigames/knockfight/knockfight", "minigames/knockfight/knockmap1", false);
-minigame.addSign("knockfightsign2", false, loc.new(gamesworld, -420, 157, -40), "minigames/knockfight/knockfight", "minigames/knockfight/knockmap2", false);
-minigame.addSign("knockfightsign3", false, loc.new(gamesworld, -421, 157, -40), "minigames/knockfight/knockfight", "minigames/knockfight/knockmap3", false);
+minigame.addSign("spleefsign1", true, loc.new(gamesworld, -401, 157, -73), "minigames/spleef/spleef", "minigames/spleef/spleefmap1", false);
+minigame.addSign("spleefsign2", true, loc.new(gamesworld, -401, 157, -72), "minigames/spleef/spleef", "minigames/spleef/spleefmap2", false);
+minigame.addSign("spleefsign3", true, loc.new(gamesworld, -401, 157, -71), "minigames/spleef/spleef", "minigames/spleef/spleefmap3", false);
+minigame.addSign("knockfightsign1", true, loc.new(gamesworld, -419, 157, -40), "minigames/knockfight/knockfight", "minigames/knockfight/knockmap1", false);
+minigame.addSign("knockfightsign2", true, loc.new(gamesworld, -420, 157, -40), "minigames/knockfight/knockfight", "minigames/knockfight/knockmap2", false);
+minigame.addSign("knockfightsign3", true, loc.new(gamesworld, -421, 157, -40), "minigames/knockfight/knockfight", "minigames/knockfight/knockmap3", false);
 minigame.addSign("invertingsign1", true, loc.new(gamesworld, -396, 158, -57), "minigames/inverting/inverting", "minigames/inverting/invertingmap1", true);
 minigame.addSign("invertingsign2", true, loc.new(gamesworld, -396, 158, -56), "minigames/inverting/inverting", "minigames/inverting/invertingmap2", true);
 minigame.addSign("invertingsign3", true, loc.new(gamesworld, -396, 158, -55), "minigames/inverting/inverting", "minigames/inverting/invertingmap3", true);

system/gamerules.txt

@@ -36,11 +36,13 @@ function world.setGamerules(world) {
 		gamerule.set.bool("doDaylightCycle", world, false);
 		gamerule.set.bool("doWeatherCycle", world, false);
 		gamerule.set.bool("doMobSpawning", world, false);
+		world.setTime(world, 1000);
 	}
 	if(world_name == "creative") {
 		gamerule.set.bool("doDaylightCycle", world, false);
 		gamerule.set.bool("doWeatherCycle", world, false);
 		gamerule.set.bool("doMobSpawning", world, false);
+		world.setTime(world, 1000);
 	}
 	if(world_name == "story") {
 		gamerule.set.bool("doMobSpawning", world, false);
@@ -48,21 +50,25 @@ function world.setGamerules(world) {
 		gamerule.set.bool("doWeatherCycle", world, false);
 		gamerule.set.bool("mobGriefing", world, false);
 		gamerule.set.int("randomTickSpeed", world, 0);
+		world.setTime(world, 1000);
 	}
 	if(world_name == "world2012") {
 		gamerule.set.bool("doDaylightCycle", world, false);
 		gamerule.set.bool("doWeatherCycle", world, false);
 		gamerule.set.bool("doMobSpawning", world, false);
+		world.setTime(world, 1000);
 	}
 	if(world_name == "world2014") {
 		gamerule.set.bool("doDaylightCycle", world, false);
 		gamerule.set.bool("doWeatherCycle", world, false);
 		gamerule.set.bool("doMobSpawning", world, false);
+		world.setTime(world, 1000);
 	}
 	if(world_name == "redstone") {
 		gamerule.set.bool("doDaylightCycle", world, false);
 		gamerule.set.bool("doWeatherCycle", world, false);
 		gamerule.set.bool("doMobSpawning", world, false);
+		world.setTime(world, 1000);
 	}
 }
 

system/survival.txt

@@ -26,6 +26,7 @@ skill.add("Jump Boost", "skill.jump_boost", "minecraft:rabbit_foot", "JumpBoost
 skill.add("Dolphin", "skill.dolphin", "minecraft:fire_coral", "Swim like a dolphin for a minute", 32, false, true, false);
 skill.add("Block Up", "skill.block_up", "minecraft:diamond_pickaxe", "Break a block and the block above for a minute", 32, false, true, false);
 skill.add("Block Down", "skill.block_down", "minecraft:diamond_pickaxe", "Break a block and the block below for a minute", 32, false, true, false);
+skill.add("Timber", "skill.timber", "minecraft:iron_axe", "Break whole trees with an axe for a minute", 128, false, true, false);
 
 clan.loadData();
 

system/timber.txt

@@ -1,7 +1,9 @@
 event.load("block_break");
 
 prop_persistent = block.getProperty("persistent");
-tag_log_burn = block.getTag("logs_that_burn");
+tag_log_burn = block.getTag("minecraft:logs_that_burn");
+axe_tag = item.getTag("km:axe");
+
 
 horizontal_dist_map = map.new();
 map.add(horizontal_dist_map, "minecraft:oak_log", 9);
@@ -11,17 +13,26 @@ map.add(horizontal_dist_map, "minecraft:jungle_log", 12);
 map.add(horizontal_dist_map, "minecraft:acacia_log", 9);
 map.add(horizontal_dist_map, "minecraft:dark_oak_log", 6);
 
+msg("dev", "§bTimber §rloaded.");
 @wait
 wait();
 if(event == "block_break") {
-	if(player.getName(player) == "marvinius") {
-		tree_type = block_type;
-		horizontal_spec_dist = map.getOrDefault(horizontal_dist_map, tree_type, 2);
-		origin_x = loc.getX(block_loc);
-		origin_z = loc.getZ(block_loc);
-		if(block.isTree(block_loc)) {
-			block.removeTree(block_loc);
-		}
+	if(cancel) {
+		goto("wait");
+	}
+	duration = data.getTimer(player, "timber");
+	if(duration < 0) {
+		goto("wait");
+	}
+	if(!player.checkHandsForTag(player, axe_tag)) {
+		goto("wait");
+	}
+	tree_type = block_type;
+	horizontal_spec_dist = map.getOrDefault(horizontal_dist_map, tree_type, 2);
+	origin_x = loc.getX(block_loc);
+	origin_z = loc.getZ(block_loc);
+	if(block.isTree(block_loc)) {
+		block.removeTree(block_loc);
 	}
 }
 goto("wait");
@@ -173,6 +184,6 @@ function block.addTreePart(location) {
 	if(!set.contains($tree_set, location)) {
 		list.add($tree_list, location);
 		set.add($tree_set, location);
-		block.set(location, "minecraft:air");
+		block.break(location, player);
 	}
 }

test.txt

@@ -1,28 +1,5 @@
-list = list.new();
-list.add(list, read.player("marvinius"));
-
-iter = list.iterator(list);
-while(hasNext(iter)) {
-	challenger = player.get(next(iter));
-	if(challenger == null) {
-		continue;
-	}
-	challenger_loc = entity.getLocation(challenger);
-	for(i = 0; i < 1000; i++) {
-		dist = math.random(1, 50);
-		alpha = math.random(0, 360);
-		alpha *= math.pi() / 180;
-		x = math.round(math.sin(alpha) * dist) + 0.5;
-		z = math.round(math.cos(alpha) * dist) + 0.5;
-		y = 100;
-		random_loc = loc.mod(challenger_loc, x, y, z);
-		while(block.isAir(random_loc)) {
-			loc.setY(random_loc, y);
-			y++;
-			if(y == 130) {
-				break;
-			}
-		}
-		entity.spawn("falling_block", random_loc, "{BlockState:{Name:\"minecraft:anvil\"},Time:1}");
-	}
-}
+p = read.player("marvinius");
+a = entity.getMotion(p);
+msg("dev", a[0]);
+msg("dev", a[1]);
+msg("dev", a[2]);

utils/u_games.txt

@@ -396,6 +396,8 @@ function minigame.addPlayed(player_or_id, game_short, amount) {
 
 function player.tpGamesLobby(player) {
 	entity.teleport(player, minigame.getLastPos(player));
+	inv = player.getInv(player);
+	inv.setItem(inv, 0, read.item("minecraft:compass"));
 }
 
 function player.resetMinigames(player) {
@@ -415,8 +417,6 @@ function resetplayer(player) {
 	player.setSaturation(player, 5);
 	display.reset(player);
 	player.clearInventory(player);
-	inv = player.getInv(player);
-	inv.setItem(inv, 0, read.item("minecraft:compass"));
 	player.showDefaultStacks(player);
 	status.reset(player);
 	entity.setName(player, player.getName(player));

utils/u_general.txt

@@ -2030,6 +2030,24 @@ function player.isCommandBlocked(player) {
 	return list.contains(list, player.getUuid(player));
 }
 
+function player.checkHandsForItem(player, item) {
+	hand = entity.getEquip(player, "hand");
+	if(item.getType(hand) == item.getType(item)) {
+		return true;
+	}
+	offhand = entity.getEquip(player, "offhand");
+	return item.getType(offhand) == item.getType(item);
+}
+
+function player.checkHandsForTag(player, tag) {
+	hand = entity.getEquip(player, "hand");
+	if(item.hasTag(tag, hand)) {
+		return true;
+	}
+	offhand = entity.getEquip(player, "offhand");
+	return item.hasTag(tag, offhand);
+}
+
 //--------------------------------------------------
 //Block-Utils
 //--------------------------------------------------