Commit 33f12b29 authored by Tommy Ang's avatar Tommy Ang 🤣

Merge branch 'feature/clean-up' into develop

parents 67dd09f6 95154b77
......@@ -1115,7 +1115,10 @@ on death of a player:
on respawn:
wait 1 tick
teleport player to {pe.spawn}
if bed of player exists:
teleport player to the player's bed
else:
teleport player to {pe.spawn}
on join:
clear {re.%player%.current.hour}
......@@ -1179,9 +1182,10 @@ on quit:
clear {pwhisper.%player%}
on server ping:
set the motd to "&eRammyCraft RP &9v1.13.2-0 &6https://www.rammycraft.pw"
set the motd to "&eRammyCraft RP &9v1.15.2-1 &6https://www.rammycraft.pw"
#set the motd to "&eRammyCraft RP &aAlpha &9v1120.0 &6Feedback is welcomed!"
#set the motd to "&eServer undergoing host transfer maintenance"
#set the motd to "&eServer undergoing maintenance"
on inventory click:
if "%event.getView().getTitle()%" is "&5TPA":
......@@ -1191,8 +1195,16 @@ on inventory click:
command /update:
executable by: console
trigger:
broadcast "&6RammyCraft has been updated to v1.14.2-0 ! Head over to our Facebook group to check for changelog."
broadcast "&6RammyCraft has been updated to v1.13.2-1 ! Head over to our Facebook group to check for changelog."
# on join:
# message "&eServer has been updated to &bv1.14.2-0&e."
# message "&eFor full update details, head over to https://web2.rammycraft.pw/updates/1.12.2.html"
on join:
#message "&eServer has been updated to &bv1.15.2-1&e."
message "&eNew article has been published on RammyCraft Website."
message "&eDev Update: Minecraft 1.16 and Nether World Reset."
message "&eRead more at https://www.rammycraft.pw/blog/dev-update-minecraft-1.16-and-world-management-changes"
#message "&eFor full update details, head over to https://www.rammycraft.pw/update/rammycraft-v1.15.2-1-shop-update"
# wait 1 second
# message "&e&n&lv1.14.4 Testing Phase"
# message "&eScheduled Maintenance"
# message "&eDate: 6 September 2019"
# message "&eTime: 6 PM - 630 PM (30 minutes)"
......@@ -220,12 +220,12 @@ on join:
if player is online:
if location of player is not equal to {pe.spawn}:
teleport player to {pe.spawn}
wait 0.5 second
wait 1 second
add 1 to {auth.timeoutcheck.%player%}
#set action bar of player to "&eLogin TimeOut - &c%{auth.timeoutcheck.%player%}%/60"
# show an action bar from "&eLogin TimeOut - &c%{auth.timeoutcheck.%player%}%/60" to player
send action bar "&eLogin TimeOut - &c%{auth.timeoutcheck.%player%}%/60" to player
if {auth.timeoutcheck.%player%} is more than or equal to 60:
send action bar "&eLogin TimeOut - &c%{auth.timeoutcheck.%player%}%/150" to player
if {auth.timeoutcheck.%player%} is more than or equal to 150:
kick player due to "Timed out"
clear {auth.timeoutcheck.%player%}
else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment