Skip to content

formatting #148

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 1 commit into from
Jul 13, 2023
Merged

formatting #148

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
1 change: 0 additions & 1 deletion gamemode/core/derma/cl_quick.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ function PANEL:addSlider(text, callback, value, min, max, decimal)
self.items[#self.items + 1] = slider

return slider

end

local color_dark = Color(255, 255, 255, 5)
Expand Down
2 changes: 1 addition & 1 deletion gamemode/core/libs/sh_chatbox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,4 +408,4 @@ nut.chat.register("event", {
})

-- Why does ULX even have a /me command?
hook.Remove("PlayerSay", "ULXMeCheck")
hook.Remove("PlayerSay", "ULXMeCheck")
4 changes: 2 additions & 2 deletions gamemode/core/meta/inventory/sv_base_inventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ function Inventory:sync(recipients)
net.WriteString(self.typeID)
net.WriteTable(self.data)
local items = {}

local function writeItem(item)
items[#items + 1] = {
i = item:getID(),
Expand All @@ -306,7 +306,7 @@ function Inventory:sync(recipients)
--local currentBytes, currentBits = net.BytesWritten()
--print("Current net message size: " .. currentBytes .. " bytes (" .. currentBits .. " bits)")


local res = net.Send(recipients or self:getRecipients())

for _, item in pairs(self.items) do
Expand Down
5 changes: 2 additions & 3 deletions gamemode/core/sh_config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ if (SERVER) then
if (client:IsSuperAdmin() and type(nut.config.stored[key].default) == type(value) and hook.Run("CanPlayerModifyConfig", client, key) ~= false) then
nut.config.set(key, value)

if (type(value) == "table") then
if (istable(value)) then
local value2 = "["
local count = table.Count(value)
local i = 1
Expand Down Expand Up @@ -248,7 +248,7 @@ if (CLIENT) then
end

-- VectorColor currently only exists for DProperties.
if (form == "Generic" and type(value) == "table" and value.r and value.g and value.b) then
if (form == "Generic" and istable(value) and value.r and value.g and value.b) then
-- Convert the color to a vector.
value = Vector(value.r / 255, value.g / 255, value.b / 255)
form = "VectorColor"
Expand Down Expand Up @@ -284,7 +284,6 @@ if (CLIENT) then
elseif (form == "Boolean") then
newValue = tobool(newValue)
end

netstream.Start("cfgSet", k, newValue)
end)
end
Expand Down
2 changes: 1 addition & 1 deletion gamemode/shared.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GM.Name = "NutScript 1.2"
GM.Author = "Chessnut, Black Tea and the NutScript team"
GM.Website = "http://nutscript.net/"

nut.version = "1.2.2"
nut.version = "1.2.3"

-- Fix for client:SteamID64() returning nil when in single-player.
do
Expand Down
3 changes: 3 additions & 0 deletions plugins/nshud/sh_plugin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ function PLUGIN:DrawEntityInfo(entity, alpha, position)
entity.nutDescCache = nil
end

entity.nutNameCache = nil
entity.nutDescCache = nil

local name = hookRun("GetDisplayedName", entity, nil, "hud") or character.getName(character)

if (name ~= entity.nutNameCache) then
Expand Down
2 changes: 1 addition & 1 deletion plugins/vendor/sv_hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function PLUGIN:VendorTradeAttempt(
client:notifyLocalized(err)
client.vendorTransaction = nil
end)

nut.log.add(client, "vendorBuy", itemType, vendor:getNetVar("name"))
end
end
Expand Down