From a602d8ad4427b8ffab2434b85f3f56abd0d6e3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 15 Jan 2024 01:42:01 +0200 Subject: [PATCH] Use %player's name% instead of %player% --- -mirricraft-old.sk | 30 ++++++++++----------- mirricraft-fly.sk | 28 +++++++++---------- mirricraft-kitpvp.sk | 64 ++++++++++++++++++++++---------------------- mirricraft-npc.sk | 2 +- mirricraft.sk | 14 +++++----- 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/-mirricraft-old.sk b/-mirricraft-old.sk index 5c09693..5e51955 100644 --- a/-mirricraft-old.sk +++ b/-mirricraft-old.sk @@ -32,7 +32,7 @@ command /mirricraft [] [] []: else: format slot 13 of player with diamond named "&bVIP" with lore "&o&fTila: Pois käytöstä" to close then run [execute player command "/mirricraft gui vip"] - format slot 15 of player with player's skull named "&6Player" with lore "&o&f%player%" to close then run [execute player command "/mirricraft gui player"] + format slot 15 of player with player's skull named "&6Player" with lore "&o&f%player's name%" to close then run [execute player command "/mirricraft gui player"] #if player have permission "mirricraft.admin": # format slot 16 of player with diamond axe named "&5Ylläpito" with lore "&o&fTila: Käytössä" to close then run [execute player command "/mirricraft admin"] @@ -89,7 +89,7 @@ command /mirricraft [] [] []: stop if arg-2 is "player": wait 2 tick - open chest inventory with 5 row named "%player%" to player + open chest inventory with 5 row named "%player's name%" to player wait 2 tick loop integers between 0 and 44: @@ -153,7 +153,7 @@ command /mirricraft [] [] []: remove all items from player set slot 0 of player's inventory to 1 of compass named "&4Mene" set slot 4 of player's inventory to 1 of diamond named "&bVIP" - set slot 8 of player's inventory to 1 of player's skull named "&6%player%" + set slot 8 of player's inventory to 1 of player's skull named "&6%player's name%" else: set slot 8 of player's inventory to 1 of ender chest named "&fMirriCraft" stop @@ -186,14 +186,14 @@ command /mirricraft [] [] []: else if arg-1 is "vip": if player has the permission "mirricraft.vip": if arg-2 is "fly": - if {fly.%player%} is not set: + if {fly.%player's name%} is not set: message "&7[&2MirriCraft&7]&r Lento on nyt sallittu" set player's flight mode to true - set {fly.%player%} to true + set {fly.%player's name%} to true stop message "&7[&2MirriCraft&7]&r Lento on pois käytöstä" set player's flight mode to false - delete {fly.%player%} + delete {fly.%player's name%} stop if arg-2 is "bannerbuilder": wait 2 tick @@ -280,7 +280,7 @@ on click: make player execute command "/mirricraft gui vip" cancel the event wait 2 tick - if event-item is player's skull named "&6%player%": + if event-item is player's skull named "&6%player's name%": make player execute command "/mirricraft gui player" cancel the event wait 2 tick @@ -292,7 +292,7 @@ on click: # cancel the event # if event-item is diamond named "&bVIP": # cancel the event -# if event-item is player's skull named "&6%player%": +# if event-item is player's skull named "&6%player's name%": # cancel the event #on drop: @@ -302,7 +302,7 @@ on click: # cancel the event # if event-item is diamond named "&bVIP": # cancel the event -# if event-item is player's skull named "&6%player%": +# if event-item is player's skull named "&6%player's name%": # cancel the event on pickup: @@ -312,7 +312,7 @@ on pickup: delete event-entity if event-item is diamond named "&bVIP": delete event-entity - if event-item is player's skull named "&6%player%": + if event-item is player's skull named "&6%player's name%": delete event-entity on death: @@ -324,7 +324,7 @@ on death: # --- Welcome Message --- #on join: # send player title "MirriCraft" for 5 seconds -# send action bar "Nauti pelihetkestäsi, %player%!" to player +# send action bar "Nauti pelihetkestäsi, %player's name%!" to player # --- World Title --- on player world change: @@ -397,14 +397,14 @@ on weather change to rain or thunder: # wait 1 tick # if "%event-region%" contains "survival_castle_event_block": # make console execute command "/uf start survival_event_newyear_2019" -# make console execute command "/ptime 14000ticks %player%" -# make console execute command "/pweather clear %player%" +# make console execute command "/ptime 14000ticks %player's name%" +# make console execute command "/pweather clear %player's name%" #on region exit: # wait 1 tick # if "%event-region%" contains "survival_castle_event_block": -# make console execute command "/ptime reset %player%" -# make console execute command "/pweather reset %player%" +# make console execute command "/ptime reset %player's name%" +# make console execute command "/pweather reset %player's name%" # make console execute command "/uf stop survival_event_newyear_2019" #on death: diff --git a/mirricraft-fly.sk b/mirricraft-fly.sk index 7361317..a0dd308 100644 --- a/mirricraft-fly.sk +++ b/mirricraft-fly.sk @@ -11,26 +11,26 @@ command /fly []: trigger: if arg-1 is not set: if player has the permission "mirricraft.fly": - if {fly.%player%} is not set: + if {fly.%player's name%} is not set: message "&7[&2MirriCraft&7]&r Lento on nyt sallittu" set player's flight mode to true - set {fly.%player%} to true + set {fly.%player's name%} to true stop else: message "&7[&2MirriCraft&7]&r Lento on pois käytöstä" set player's flight mode to false - delete {fly.%player%} - stop - if arg-1 is set: - if player has permission "mirricraft.admin": - if {fly.%arg-1%} is not set: - set arg-1's flight mode to true - set {fly.%arg-1%} to true - stop - else: - set arg-1's flight mode to false - delete {fly.%arg-1%} + delete {fly.%player's name%} stop +# if arg-1 is set: +# if player has permission "mirricraft.admin": +# if {fly.%arg-1%} is not set: +# set arg-1's flight mode to true +# set {fly.%arg-1%} to true +# stop +# else: +# set arg-1's flight mode to false +# delete {fly.%arg-1%} +# stop on quit: - delete {fly.%player%} + delete {fly.%player's name%} diff --git a/mirricraft-kitpvp.sk b/mirricraft-kitpvp.sk index f2e5799..e69b2e5 100644 --- a/mirricraft-kitpvp.sk +++ b/mirricraft-kitpvp.sk @@ -18,30 +18,30 @@ command /kitpvp [] []: loop integers between 0 and 35: format slot loop-integer of player with gray stained glass pane named "&7" to be unstealable - if {kitpvp.%player%.map} is set: - if {kitpvp.%player%.map} is "winter": + if {kitpvp.%player's name%.map} is set: + if {kitpvp.%player's name%.map} is "winter": format slot 12 of player with compass named "&fKartta" with lore "Talvi" to close then run [execute player command "/kitpvp setmap"] - if {kitpvp.%player%.map} is "nether": + if {kitpvp.%player's name%.map} is "nether": format slot 12 of player with compass named "&fKartta" with lore "Horna" to close then run [execute player command "/kitpvp setmap"] - if {kitpvp.%player%.map} is "farm": + if {kitpvp.%player's name%.map} is "farm": format slot 12 of player with compass named "&fKartta" with lore "Farmi" to close then run [execute player command "/kitpvp setmap"] else: format slot 12 of player with compass named "&fKartta" to close then run [execute player command "/kitpvp setmap"] - if {kitpvp.%player%.kit} is set: - if {kitpvp.%player%.kit} is "soldier": + if {kitpvp.%player's name%.kit} is set: + if {kitpvp.%player's name%.kit} is "soldier": format slot 14 of player with iron chestplate named "&fKitit" with lore "Sotilas" to close then run [execute player command "/kitpvp setkit"] - if {kitpvp.%player%.kit} is "speedster": + if {kitpvp.%player's name%.kit} is "speedster": format slot 14 of player with iron chestplate named "&fKitit" with lore "Vauhtihirmu" to close then run [execute player command "/kitpvp setkit"] - if {kitpvp.%player%.kit} is "archer": + if {kitpvp.%player's name%.kit} is "archer": format slot 14 of player with iron chestplate named "&fKitit" with lore "Jousimies" to close then run [execute player command "/kitpvp setkit"] else: format slot 14 of player with iron chestplate named "&fKitit" to close then run [execute player command "/kitpvp setkit"] - if {kitpvp.%player%.started} is set: + if {kitpvp.%player's name%.started} is set: format slot 27 of player with barrier named "&fLopeta" to close then run [execute player command "/kitpvp end"] else: - if {kitpvp.%player%.map} and {kitpvp.%player%.kit} is set: + if {kitpvp.%player's name%.map} and {kitpvp.%player's name%.kit} is set: format slot 35 of player with nether star named "&fAloita" to close then run [execute player command "/kitpvp start"] stop @@ -61,15 +61,15 @@ command /kitpvp [] []: format slot 15 of player with hay bale named "&fFarmi" to close then run [execute player command "/kitpvp setmap farm"] else: if arg-2 is "winter": - set {kitpvp.%player%.map} to "winter" + set {kitpvp.%player's name%.map} to "winter" make player execute command "/kitpvp" stop if arg-2 is "nether": - set {kitpvp.%player%.map} to "nether" + set {kitpvp.%player's name%.map} to "nether" make player execute command "/kitpvp" stop if arg-2 is "farm": - set {kitpvp.%player%.map} to "farm" + set {kitpvp.%player's name%.map} to "farm" make player execute command "/kitpvp" stop stop @@ -88,15 +88,15 @@ command /kitpvp [] []: stop else: if arg-2 is "soldier": - set {kitpvp.%player%.kit} to "soldier" + set {kitpvp.%player's name%.kit} to "soldier" make player execute command "/kitpvp" stop if arg-2 is "speedster": - set {kitpvp.%player%.kit} to "speedster" + set {kitpvp.%player's name%.kit} to "speedster" make player execute command "/kitpvp" stop if arg-2 is "archer": - set {kitpvp.%player%.kit} to "archer" + set {kitpvp.%player's name%.kit} to "archer" make player execute command "/kitpvp" stop stop @@ -105,21 +105,21 @@ command /kitpvp [] []: set gamemode of player to Survival remove all items from player - if {kitpvp.%player%.kit} is set: - if {kitpvp.%player%.kit} is "soldier": + if {kitpvp.%player's name%.kit} is set: + if {kitpvp.%player's name%.kit} is "soldier": set player's helmet to iron helmet set player's chestplate to iron chestplate set player's leggings to iron leggings set player's boots to iron boots set slot 0 of player's inventory to 1 of iron sword - if {kitpvp.%player%.kit} is "speedster": + if {kitpvp.%player's name%.kit} is "speedster": set player's helmet to gold helmet set player's chestplate to gold chestplate set player's leggings to gold leggings set player's boots to gold boots set the player's walk speed to 0.4 set slot 0 of player's inventory to 1 of gold sword - if {kitpvp.%player%.kit} is "archer": + if {kitpvp.%player's name%.kit} is "archer": set player's helmet to chainmail helmet set player's chestplate to chainmail chestplate set player's leggings to chainmail leggings @@ -129,23 +129,23 @@ command /kitpvp [] []: else: make player execute command "/kitpvp" - if {kitpvp.%player%.map} is set: - if {kitpvp.%player%.map} is "winter": + if {kitpvp.%player's name%.map} is set: + if {kitpvp.%player's name%.map} is "winter": teleport player to location -48, 6, 264 - else if {kitpvp.%player%.map} is "nether": + else if {kitpvp.%player's name%.map} is "nether": teleport player to location 73, 4, 269 - else if {kitpvp.%player%.map} is "farm": + else if {kitpvp.%player's name%.map} is "farm": teleport player to location 57, 5, 357 else: make player execute command "/kitpvp" - if {kitpvp.%player%.started} is not set: + if {kitpvp.%player's name%.started} is not set: heal the player - set {kitpvp.%player%.started} to true + set {kitpvp.%player's name%.started} to true stop else if arg-1 is "end": remove all items from player - clear {kitpvp.%player%.started} + clear {kitpvp.%player's name%.started} teleport player to spawn of "%player's world%" stop else: @@ -178,7 +178,7 @@ on death: on quit: if player's world is "minigames": remove all items from player - clear {kitpvp.%player%.started} + clear {kitpvp.%player's name%.started} stop on leftclick: @@ -212,17 +212,17 @@ on pickup: on break: if player's world is "minigames": - if {kitpvp.%player%.started} is set: + if {kitpvp.%player's name%.started} is set: cancel event on block damage: if player's world is "minigames": - if {kitpvp.%player%.started} is set: + if {kitpvp.%player's name%.started} is set: cancel event on item damage: if player's world is "minigames": - if {kitpvp.%player%.started} is set: + if {kitpvp.%player's name%.started} is set: cancel event on region exit: @@ -231,7 +231,7 @@ on region exit: if "%event-region%" contains "minigames_kitpvp_": remove all items from player set the player's walk speed to 0.2 - clear {kitpvp.%player%.started} + clear {kitpvp.%player's name%.started} on hunger meter change: if player's world is "minigames": diff --git a/mirricraft-npc.sk b/mirricraft-npc.sk index 6c87402..e371e23 100644 --- a/mirricraft-npc.sk +++ b/mirricraft-npc.sk @@ -12,6 +12,6 @@ on rightclick on entity: if player doesn't have the permission "group.jasen": message "&7[&r%name of clicked entity%&7]&r Annoin sinulle jäsenroolin, muistathan käyttäytyä!" to player if player doesn't have the permission "group.aikainenjasen": - make console execute command "/lp user %player% group add jasen" + make console execute command "/lp user %player's name% group add jasen" else: message "&7[&r%name of clicked entity%&7]&r Olet jo jäsen" to player diff --git a/mirricraft.sk b/mirricraft.sk index 574b014..c023212 100644 --- a/mirricraft.sk +++ b/mirricraft.sk @@ -30,7 +30,7 @@ on click: make player execute command "/mirricraft gui admin" cancel the event wait 2 tick - if event-item is player's skull named "&6%player%": + if event-item is player's skull named "&6%player's name%": make player execute command "/mirricraft gui player" cancel the event wait 2 tick @@ -44,7 +44,7 @@ on pickup: delete event-entity if event-item is diamond named "&5Ylläpito": delete event-entity - if event-item is player's skull named "&6%player%": + if event-item is player's skull named "&6%player's name%": delete event-entity on death: @@ -119,12 +119,12 @@ command /mirricraft [] [] [] []: set slot 0 of player's inventory to 1 of compass named "&2Mene" set slot 4 of player's inventory to 1 of diamond named "&bVIP" set slot 6 of player's inventory to 1 of diamond axe named "&5Ylläpito" - set slot 8 of player's inventory to 1 of player's skull named "&6%player%" + set slot 8 of player's inventory to 1 of player's skull named "&6%player's name%" stop else: set slot 0 of player's inventory to 1 of compass named "&2Mene" set slot 4 of player's inventory to 1 of diamond named "&bVIP" - set slot 8 of player's inventory to 1 of player's skull named "&6%player%" + set slot 8 of player's inventory to 1 of player's skull named "&6%player's name%" stop else: set slot 8 of player's inventory to 1 of ender chest named "&fMirriCraft" @@ -147,12 +147,12 @@ command /mirricraft [] [] [] []: format slot 10 of player with compass named "&2Mene" with lore "-" to close then run [execute player command "/mirricraft gui visit"] format slot 12 of player with diamond named "&bVIP" with lore "-" to close then run [execute player command "/mirricraft gui vip"] format slot 14 of player with diamond axe named "&5Ylläpito" with lore "-" to close then run [execute player command "/mirricraft gui admin"] - format slot 16 of player with player's skull named "&6Player" with lore "&o&f%player%" to close then run [execute player command "/mirricraft gui player"] + format slot 16 of player with player's skull named "&6Player" with lore "&o&f%player's name%" to close then run [execute player command "/mirricraft gui player"] stop else: format slot 10 of player with compass named "&2Mene" with lore "-" to close then run [execute player command "/mirricraft gui visit"] format slot 13 of player with diamond named "&bVIP" with lore "-" to close then run [execute player command "/mirricraft gui vip"] - format slot 16 of player with player's skull named "&6Player" with lore "&o&f%player%" to close then run [execute player command "/mirricraft gui player"] + format slot 16 of player with player's skull named "&6Player" with lore "&o&f%player's name%" to close then run [execute player command "/mirricraft gui player"] stop if arg-2 is set: if arg-2 is "visit": @@ -190,7 +190,7 @@ command /mirricraft [] [] [] []: stop if arg-2 is "player": wait 2 tick - open chest inventory with 4 row named "MirriCraft - %player%" to player + open chest inventory with 4 row named "MirriCraft - %player's name%" to player wait 2 tick loop integers between 0 and 35: