From 9780aa604bd54b6e763fd9f5cf124c63f30b45ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Sun, 23 Apr 2023 18:24:30 +0300 Subject: [PATCH] Update --- mirricraft-kitpvp.sk | 12 ++++++------ mirricraft-old.sk | 28 +++++++++++++++++++--------- mirricraft-portals.sk | 8 ++++---- mirricraft-spawn.sk | 4 ++-- mirricraft.sk | 6 +++--- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/mirricraft-kitpvp.sk b/mirricraft-kitpvp.sk index 22305e3..995c606 100644 --- a/mirricraft-kitpvp.sk +++ b/mirricraft-kitpvp.sk @@ -140,7 +140,7 @@ command /kitpvp [] []: else if arg-1 is "end": remove all items from player clear {kitpvp.%player%.started} - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" stop else: stop @@ -151,7 +151,7 @@ command /kitpvp [] []: on join: if player's world is "minigames": - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" remove all items from player set the player's walk speed to 0.2 set slot 7 of player's inventory to 1 of chest named "&fKitPVP" @@ -163,10 +163,10 @@ on respawn: stop on death: - if player's world is "minigames": - remove all items from player - set the player's walk speed to 0.2 - clear {kitpvp.%player%.started} + if victim's world is "minigames": + remove all items from victim + set the victim's walk speed to 0.2 + clear {kitpvp.%victim%.started} clear drops on quit: diff --git a/mirricraft-old.sk b/mirricraft-old.sk index a385897..999dd52 100644 --- a/mirricraft-old.sk +++ b/mirricraft-old.sk @@ -102,35 +102,45 @@ command /mirricraft [] [] []: else if arg-1 is "visit": if player has the permission "mirricraft.visit": if arg-2 is "lobby": + wait 2 tick connect player to "lobby" stop else if arg-2 is "truelo": + wait 2 tick connect player to "truelo" stop else if arg-2 is "utopia": + wait 2 tick connect player to "utopia" stop else if arg-2 is "skyblock": + wait 2 tick connect player to "skyblock" stop else if arg-2 is "minigames": + wait 2 tick connect player to "minigames" stop else if arg-2 is "multiverse": + wait 2 tick connect player to "multiverse" stop else if arg-2 is "multiverse-hub" or "hub" or "multiverse-creative" or "multiverse-survival" or "multiverse-skyblock": if arg-2 is "multiverse-hub": - teleport player to world "hub" + wait 2 tick + teleport player to spawn of "hub" stop if arg-2 is "multiverse-creative": - teleport player to world "creative" + wait 2 tick + teleport player to spawn of "creative" stop if arg-2 is "multiverse-survival": - teleport player to world "survival" + wait 2 tick + teleport player to spawn of "survival" stop if arg-2 is "multiverse-skyblock": - teleport player to world "skyblock" + wait 2 tick + teleport player to spawn of "skyblock" stop stop else: @@ -249,9 +259,9 @@ command /visit []: # OTHER FUNCTIONS # --- MirriCraft Item --- -on join: - make player execute command "/mirricraft item" - stop +#on join: +# make player execute command "/mirricraft item" +# stop on respawn: make player execute command "/mirricraft item" @@ -325,9 +335,9 @@ on pickup: delete event-entity on death: - if player's world is "lobby": + if victim's world is "lobby": clear drops - if player's world is "utopia": + if victim's world is "utopia": clear drops # --- Welcome Message --- diff --git a/mirricraft-portals.sk b/mirricraft-portals.sk index e2dda0e..fe6e32a 100644 --- a/mirricraft-portals.sk +++ b/mirricraft-portals.sk @@ -2,14 +2,14 @@ on region enter: wait 1 tick if "%event-region%" contains "_portal_to_lobby": - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" connect player to "lobby" if "%event-region%" contains "_portal_to_utopia": - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" connect player to "utopia" if "%event-region%" contains "_portal_to_skyblock": - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" connect player to "skyblock" if "%event-region%" contains "_portal_to_minigames": - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" connect player to "minigames" \ No newline at end of file diff --git a/mirricraft-spawn.sk b/mirricraft-spawn.sk index 1f453c8..563579f 100644 --- a/mirricraft-spawn.sk +++ b/mirricraft-spawn.sk @@ -4,8 +4,8 @@ command /spawn: executable by: players trigger: if "%player's world%" contains "skyblock_": - teleport player to world "skyblock" + teleport player to spawn of "skyblock" stop else: - teleport player to world "%player's world%" + teleport player to spawn of "%player's world%" stop \ No newline at end of file diff --git a/mirricraft.sk b/mirricraft.sk index 76e0fc1..965fe22 100644 --- a/mirricraft.sk +++ b/mirricraft.sk @@ -20,9 +20,9 @@ on load: stop # --- Bossbar --- -on join: - create bossbar titled "&f&lMirriCraft" and id "bossbar.%player's uuid%" for player with progress 100 with colors white - stop +#on join: +# create bossbar titled "&f&lMirriCraft" and id "bossbar.%player's uuid%" for player with progress 100 with colors white +# stop # --- Welcome Message --- on join: