Skip to content

Commit

Permalink
Merge pull request #666 from bitpredator/dev
Browse files Browse the repository at this point in the history
chore: fixes in es_extended removed some files and other useful works
  • Loading branch information
bitpredator authored Mar 6, 2024
2 parents b3f6ac6 + 9fb10f2 commit ae0ded9
Show file tree
Hide file tree
Showing 54 changed files with 12,542 additions and 15,525 deletions.
23 changes: 0 additions & 23 deletions .github/workflows/formatt-all.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ server-data/resources/\[gameplay]
server-data/resources/\[managers]
server-data/resources/\[system]
server-data/resources/\[system]/\[builders]
server-data/resources/\[test]
server-data/resources/\[gamemodes]

# Resources log
server-data/resources/\[phone]/npwd/sv_npwd.log
5 changes: 3 additions & 2 deletions server-data/resources/[esx]/es_extended/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

es_extended Copyright (C) 2022-2024 bitpredator
es_extended
Copyright (C) 2015-2023 Jérémie N'gadi

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -651,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

es_extended Copyright (C) 2022-2024 bitpredator
es_extended Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
10 changes: 3 additions & 7 deletions server-data/resources/[esx]/es_extended/client/common.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
exports("getSharedObject", function()
return ESX
return ESX
end)

AddEventHandler("esx:getSharedObject", function()
local Invoke = GetInvokingResource()
print(
("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(
Invoke
)
)
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://bitpredator.github.io/bptdevelopment/docs/esx-tutorial/sharedevent for how to fix!"):format(Invoke))
end)
Loading

0 comments on commit ae0ded9

Please sign in to comment.