Skip to content
This repository has been archived by the owner on Jun 23, 2023. It is now read-only.

Commit

Permalink
Fix some crashes
Browse files Browse the repository at this point in the history
  • Loading branch information
rexxar-tc committed Jan 30, 2017
1 parent 7607ed3 commit 769882f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions EssentialsPlugin/AssemblyFileVersion.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//415
//418
//
// This code was generated by a tool. Any changes made manually will be lost
// the next time this code is regenerated.
//

using System.Reflection;

[assembly: AssemblyFileVersion("1.13.7.415")]
[assembly: AssemblyVersion("1.13.7.415")]
[assembly: AssemblyFileVersion("1.13.7.418")]
[assembly: AssemblyVersion("1.13.7.418")]
15 changes: 8 additions & 7 deletions EssentialsPlugin/EntityManagers/EntityManagement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Sandbox.Game.World;
using Sandbox.Game.Entities.Blocks;
using Sandbox.Game.Entities.Cube;
using SpaceEngineers.Game.Entities.Blocks;
using SpaceEngineers.Game.ModAPI;
using VRage.Collections;
using VRage.Game;
Expand Down Expand Up @@ -310,43 +311,43 @@ private static bool CheckRevealBlockRules( MyCubeGrid grid, out string reason )

foreach ( var cubeBlock in grid.GetFatBlocks() )
{
var beacon = cubeBlock as IMyBeacon;
var beacon = cubeBlock as MyBeacon;
if ( beacon != null )
{
if ( !beacon.Enabled )
continue;

foreach ( var player in players )
{
var distance = Vector3D.Distance( player.GetPosition(), beacon.GetPosition() );
var distance = Vector3D.Distance( player.GetPosition(), beacon.PositionComp.GetPosition() );

if ( distance < beacon.Radius )
if ( distance < ((IMyBeacon)beacon).Radius )
{
reason = $"{player.DisplayName} distance to beacon broadcast: {distance}";
return true;
}
}
}

var antenna = cubeBlock as IMyRadioAntenna;
var antenna = cubeBlock as MyRadioAntenna;
if ( antenna != null )
{
if ( !antenna.Enabled )
continue;

foreach ( var player in players )
{
var distance = Vector3D.Distance( player.GetPosition(), antenna.GetPosition() );
var distance = Vector3D.Distance( player.GetPosition(), antenna.PositionComp.GetPosition( ) );

if ( distance < antenna.Radius )
if ( distance < antenna.GetRadius( ) )
{
reason = $"{player.DisplayName} distance to antenna broadcast: {distance}";
return true;
}
}
}

var medical = cubeBlock as IMyMedicalRoom;
var medical = cubeBlock as MyMedicalRoom;
if ( medical != null )
{
if ( !medical.Enabled || !medical.IsFunctional )
Expand Down
4 changes: 2 additions & 2 deletions EssentialsPlugin/Utility/Communication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ public static void SendDataMessage( ulong steamId, DataMessageType messageType,
//Wrapper.GameAction( ( ) =>
MySandboxGame.Static.Invoke( () =>
{
//MyAPIGateway.Multiplayer.SendMessageTo( 9000, newData, steamId );
ServerNetworkManager.Instance.SendModMessageTo( 9000, newData, steamId );
MyAPIGateway.Multiplayer.SendMessageTo( 9000, newData, steamId );
//ServerNetworkManager.Instance.SendModMessageTo( 9000, newData, steamId );
} );
}

Expand Down

0 comments on commit 769882f

Please sign in to comment.