Skip to content

fix deprecated style argument "u" in cCompositeChat:AddSuggestCommandPart #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danissomo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix deprecated style argument "u" in cCompositeChat:AddSuggestCommandPart #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ function OnChat(a_Player, a_Message)
a_Player:SendMessage(
cCompositeChat()
:AddTextPart("Please use ")
:AddSuggestCommandPart("/login", "/login", "u")
:AddSuggestCommandPart("/login <password>", "/login", "n")
:AddTextPart(" first before trying to chat.")
)
else
a_Player:SendMessage(
cCompositeChat()
:AddTextPart("Please ")
:AddSuggestCommandPart("register", "/register", "u")
:AddSuggestCommandPart("/register <password> <confirmpassword>", "/register", "n")
:AddTextPart(" first before trying to chat.")
)
end
Expand All @@ -63,7 +63,7 @@ function OnExecuteCommand(a_Player, a_Command)
a_Player:SendMessage(
cCompositeChat()
:AddTextPart("Please use ")
:AddSuggestCommandPart("/login", "/login", "u")
:AddSuggestCommandPart("/login <password>", "/login", "n")
:AddTextPart(" first before trying to execute a command.")
)
return true
Expand All @@ -78,7 +78,7 @@ function OnExecuteCommand(a_Player, a_Command)
a_Player:SendMessage(
cCompositeChat()
:AddTextPart("Please use ")
:AddSuggestCommandPart("/register", "/register", "u")
:AddSuggestCommandPart("/register <password> <confirmpassword>", "/register", "n")
:AddTextPart(" first before trying to execute a command.")
)
return true
Expand Down Expand Up @@ -110,7 +110,7 @@ function OnPlayerLeftClick(a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace,
a_Player:SendMessage(
cCompositeChat()
:AddTextPart("Please use ")
:AddSuggestCommandPart("/login", "/login", "u")
:AddSuggestCommandPart("/login <password>", "/login", "n")
:AddTextPart(" first.")
)
return true
Expand Down Expand Up @@ -157,7 +157,7 @@ function OnPlayerRightClick(a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace,
a_Player:SendMessage(
cCompositeChat()
:AddTextPart("Please use ")
:AddSuggestCommandPart("/login", "/login", "u")
:AddSuggestCommandPart("/login <password>", "/login", "n")
:AddTextPart(" first.")
)
return true
Expand Down
8 changes: 4 additions & 4 deletions playerstate.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function cPlayerState:new(a_Player, a_IsLoggedIn)
Obj.m_IsLoggedIn = a_IsLoggedIn
Obj.m_StartPos = Vector3f(a_Player:GetPosition())
Obj.m_Teleporting = false
Obj.m_MessageTick = g_Config.LoginMessageTime
Obj.m_MessageTick = 0

if (not a_IsLoggedIn) then
local World = a_Player:GetWorld()
Expand Down Expand Up @@ -85,16 +85,16 @@ function cPlayerState:TickMessage()
end

self.m_MessageTick = self.m_MessageTick - 1
if (self.m_MessageTick ~= 0) then
if (self.m_MessageTick > 0) then
-- Not enough time has passed to send a new message
return
end

local Message
if (self:Exists()) then
Message = cCompositeChat():AddTextPart("Please login by using "):AddSuggestCommandPart("/login", "/login", "u")
Message = cCompositeChat():AddTextPart("Please login by using "):AddSuggestCommandPart("/login <password>", "/login", "n")
else
Message = cCompositeChat():AddTextPart("Please register by using "):AddSuggestCommandPart("/register", "/register", "u")
Message = cCompositeChat():AddTextPart("Please register by using "):AddSuggestCommandPart("/register <password> <confirmpassword>", "/register", "n")
end

self.m_MessageTick = g_Config.LoginMessageTime
Expand Down