Skip to content

editor: prevent vehicle damage and blowVehicle when in basic test mode #652

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.

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions [editor]/editor_gui/client/test.lua
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ function basicTest()
editor_main.resume(true)
inBasicTest = false
removeEventHandler("onClientPlayerDamage", localPlayer, noDamageInBasicTest)
removeEventHandler("onClientVehicleDamage", root, noDamageInBasicTest)
triggerServerEvent("onBasicTestEnd", localPlayer)
toggleControl("fire", true)
toggleControl("enter_exit", true)
toggleControl("enter_passenger", true)
Expand All @@ -247,6 +249,8 @@ function basicTest()
toggleControl("enter_passenger", false)
inBasicTest = true
addEventHandler("onClientPlayerDamage", localPlayer, noDamageInBasicTest)
addEventHandler("onClientVehicleDamage", root, noDamageInBasicTest)
triggerServerEvent("onBasicTestStart", localPlayer)
outputChatBox("Press F6 to leave basic test", 0, 255, 0)
bindControl ( "toggle_basictest", "down", basicTest )

Expand Down
1 change: 1 addition & 0 deletions [editor]/editor_gui/meta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<!-- Server-side logic -->
<script src="server/guiserverlink.lua" type="server" />
<script src="server/interface.lua" type="server" />
<script src="server/override.lua" type="server" />

<!-- GUI icons -->
<!-- Most icons courtesy of the Evaraldo Crystal icon gallery -->
Expand Down
32 changes: 32 additions & 0 deletions [editor]/editor_gui/server/override.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
local playersInBasicTest = {}

addEvent("onBasicTestStart", true)
addEventHandler("onBasicTestStart", root, function()
if client and client ~= source then
return
end
playersInBasicTest[source] = true
end)

addEvent("onBasicTestEnd", true)
addEventHandler("onBasicTestEnd", root, function()
if client and client ~= source then
return
end
playersInBasicTest[source] = nil
end)

addEventHandler("onPlayerQuit", root, function()
playersInBasicTest[source] = nil
end)

addEventHandler("onVehicleExplode", root, function()
for player in pairs(playersInBasicTest) do
if isElement(player) then
local vehicle = getPedOccupiedVehicle(player)
if vehicle == source then
cancelEvent()
end
end
end
end)
Loading