Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-07-15 16:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'NoEvo'

Browse source
This commit is contained in:
ChocoTaco 2021-08-29 13:35:36 -04:00
commit 2b5bf248ea
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Classic/scripts/LakRabbitGame.cs
View file

@ -1668,6 +1668,9 @@ function LakRabbitGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageTy
function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLoc) function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLoc)
{ {
//Make sure OOB damage is cancelled
cancel(%clVictim.player.alertThread);
// borlak - make sure victim isn't killer // borlak - make sure victim isn't killer
if(%clKiller != %clVictim) if(%clKiller != %clVictim)
{ {
@ -1682,6 +1685,7 @@ function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType,
if(Game.duelMode && %killer.player.holdingFlag && %damageType != $DamageType::Missile) if(Game.duelMode && %killer.player.holdingFlag && %damageType != $DamageType::Missile)
duelBonus(%killer); duelBonus(%killer);
} }
// borlak -- flag bug fix // borlak -- flag bug fix
%clVictim.flagDeny = schedule(2500, 0, setFlagDeny, %clVictim, 0); %clVictim.flagDeny = schedule(2500, 0, setFlagDeny, %clVictim, 0);
@ -2081,7 +2085,6 @@ function LakRabbitGame::enterMissionArea(%game, %playerData, %player)
cancel(%player.alertThread); cancel(%player.alertThread);
} }
// borlak -- TAKEN FROM TR2 -- thanks! :D // borlak -- TAKEN FROM TR2 -- thanks! :D
function plzBounceOffGrid(%obj, %bounceForce, %count) function plzBounceOffGrid(%obj, %bounceForce, %count)
{ {
@ -2154,6 +2157,7 @@ function plzBounceOffGrid(%obj, %bounceForce, %count)
schedule(250, 0, plzBounceOffGrid, %obj, %bounceForce, %count + 1); schedule(250, 0, plzBounceOffGrid, %obj, %bounceForce, %count + 1);
} }
} }
function isOutOfBounds(%position) function isOutOfBounds(%position)
{ {
%shapePos = %position; %shapePos = %position;
@ -2168,6 +2172,7 @@ function isOutOfBounds(%position)
return (%shapex < %boundsWest || %shapex > %boundsEast || return (%shapex < %boundsWest || %shapex > %boundsEast ||
%shapey < %boundsNorth || %shapey > %boundsSouth); %shapey < %boundsNorth || %shapey > %boundsSouth);
} }
function getHeight(%this) function getHeight(%this)
{ {
%z = getWord(%this.getPosition(), 2); %z = getWord(%this.getPosition(), 2);
@ -2190,7 +2195,6 @@ function LakRabbitGame::leaveMissionArea(%game, %playerData, %player)
// From Arena // From Arena
// ------------------------------------------------------------------ // // ------------------------------------------------------------------ //
// Do damage to a player for being outside the mission area // Do damage to a player for being outside the mission area
function LakRabbitGame::MissionAreaDamage(%game, %player) function LakRabbitGame::MissionAreaDamage(%game, %player)
{ {
if(%player.getState() !$= "Dead") if(%player.getState() !$= "Dead")

4
Classic/scripts/autoexec/MemPatches.cs
View file

@ -48,3 +48,7 @@ function serverCmd(%client)
BanList::add(%client.guid, %client.getAddress(), $Host::BanTime); BanList::add(%client.guid, %client.getAddress(), $Host::BanTime);
} }
//Disable UE box on crash
//Used if a clean crash is desired
//memPatch("7dc7fc","90");