Skip to content
Merged
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
7 changes: 7 additions & 0 deletions [editor]/editor_main/client/playerspawn.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
addEventHandler("onClientPlayerSpawn",localPlayer,
function()
if not getElementData(resourceRoot, "g_in_test") then
setElementInterior(localPlayer, getWorkingInterior())
end
end
)
1 change: 1 addition & 0 deletions [editor]/editor_main/meta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<!-- Player attachment and spawning -->
<script src="client/superman.lua" type="client" validate="false" />
<script src="client/attachplayer.lua" type="client" validate="false" />
<script src="client/playerspawn.lua" type="client" />
<script src="server/playerspawn.lua" type="server" />
<script src="server/playerblips.lua" type="server" />

Expand Down
10 changes: 10 additions & 0 deletions [editor]/editor_main/server/playerspawn.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ addEventHandler ( "onPlayerJoin", root,
end
)

addEventHandler ( "onPlayerWasted", root,
function()
if not g_in_test then
local x,y,z = getElementPosition(source)
local rx,ry,rz = getElementRotation(source)
spawnPlayer ( source, x, y, z, rz, 0, 0, getWorkingDimension() )
end
end
)

function disablePickups(bool)
if bool and not pickupsDisabled then
pickupsDisabled = true
Expand Down