Skip to content

Fixed a bug where door info won't draw when it should #79

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

Merged
TovarischPootis merged 2 commits into from
Jul 8, 2021
Merged

Fixed a bug where door info won't draw when it should #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1855f7
Fixed a bug where door info won't draw when it should
TovarischPootis Jul 8, 2021
afb6687
Update sv_transfer.lua
TovarischPootis Jul 8, 2021
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
2 changes: 1 addition & 1 deletion plugins/doors/cl_plugin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ local configGet = nut.config.get
local teamGetColor = team.GetColor

function PLUGIN:DrawEntityInfo(entity, alpha)
if (entity.isDoor(entity) and !entity:getNetVar("hidden") and hook.Run("CanDrawDoorInfo", entity)) then
if (entity.isDoor(entity) and !entity:getNetVar("hidden") and hook.Run("CanDrawDoorInfo", entity)) ~= false then
local position = toScreen(entity.LocalToWorld(entity, entity.OBBCenter(entity)))
local x, y = position.x, position.y
local owner = entity.GetDTEntity(entity, 0)
Expand Down
8 changes: 4 additions & 4 deletions plugins/doors/sh_commands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ nut.command.add("doorsell", {
else
-- Tell the player the door isn't valid.
client:notifyLocalized("dNotValid")
end
end
end
})

Expand Down Expand Up @@ -70,7 +70,7 @@ nut.command.add("doorbuy", {
entity.nutAccess = {
[client] = DOOR_OWNER
}

PLUGIN:callOnDoorChildren(entity, function(child)
child:SetDTEntity(0, client)
end)
Expand Down Expand Up @@ -356,7 +356,7 @@ nut.command.add("doorsetchild", {
else
-- Tell the player the door isn't valid.
client:notifyLocalized("dNotValid")
end
end
end
})

Expand Down Expand Up @@ -393,7 +393,7 @@ nut.command.add("doorremovechild", {
else
-- Tell the player the door isn't valid.
client:notifyLocalized("dNotValid")
end
end
end
})

Expand Down
4 changes: 2 additions & 2 deletions plugins/gridinv/sv_transfer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function PLUGIN:HandleItemTransferRequest(client, itemID, x, y, invID)
end
-- Make sure the item is permitted to move between the two inventories.
local status,reason = hook.Run("CanItemBeTransfered", item, oldInventory, inventory, client)

if (status == false) then client:notify(reason or "You can't do that right now.") return end

local context = {
Expand Down Expand Up @@ -96,7 +96,7 @@ function PLUGIN:HandleItemTransferRequest(client, itemID, x, y, invID)
end)
:next(function(res)
client.invTransferTransaction = nil

if (res and res.error) then
fail()
else
Expand Down