diff --git a/resources/Schema/Entities/NewMap.xml b/resources/Schema/Entities/NewMap.xml
index f4c768f0..1ae09247 100644
--- a/resources/Schema/Entities/NewMap.xml
+++ b/resources/Schema/Entities/NewMap.xml
@@ -3365,7 +3365,7 @@
Models/Core/UnitCylinder.mesh
-
+
true
@@ -3401,7 +3401,7 @@
Models/Core/UnitCylinder.mesh
-
+
true
@@ -3465,7 +3465,7 @@
Models/Core/UnitCylinder.mesh
-
+
true
@@ -3500,7 +3500,7 @@
Models/Core/UnitCylinder.mesh
-
+
true
@@ -3618,7 +3618,7 @@
- Schema/Entities/Player.xml
+ Schema/Entities/PlayerRed.xml
@@ -3829,6 +3829,72 @@
+
+
+
+
+ Schema/Entities/Player.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Characters/Assault/AssaultTPose.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Characters/Assault/AssaultTPose.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Characters/Assault/AssaultTPose.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Characters/Assault/AssaultTPose.mesh
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/PlayerRed.xml b/resources/Schema/Entities/PlayerRed.xml
new file mode 100644
index 00000000..ae11fa00
--- /dev/null
+++ b/resources/Schema/Entities/PlayerRed.xml
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+ 600
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fonts/DroidSans.ttf,100
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Widgets/Camera.mesh
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ Models/Core/UnitHexagon.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Weapons/Crosshair/SmallThickHoleDot.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/HitMarker.xml
+
+
+
+
+
+
+
+
+
+
+ Idle
+ 0.1719161089749548
+ 1
+
+
+ Models/Characters/Assault/FirstPerson.mesh
+ true
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Red/AssaultWeaponRed.mesh
+ true
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/RayRed.xml
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/ReloadEffectView.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Widgets/Camera.mesh
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Idle
+ 1.8038469763698401
+ 1
+
+
+ AimRifle
+
+
+
+
+ Models/Characters/Assault/AssaultAnimations.mesh
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Red/AssaultWeaponRed.mesh
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/RayRed.xml
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/ReloadEffectWorld.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+ false
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/RayRed.xml b/resources/Schema/Entities/RayRed.xml
index 11a9b077..0a20f148 100644
--- a/resources/Schema/Entities/RayRed.xml
+++ b/resources/Schema/Entities/RayRed.xml
@@ -6,12 +6,12 @@
0.25
- Models/Weapons/CylinderBullet.mesh
-
+ Models/Effects/CylinderShot.mesh
+
true
-
+
diff --git a/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp b/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
index 72b98639..706adaa0 100644
--- a/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
+++ b/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
@@ -348,6 +348,9 @@ bool AssaultWeaponBehaviour::shoot(double damage)
}
EntityWrapper victim(m_World, pickData.Entity);
+ if (!victim.Valid()) {
+ return false;
+ }
// Don't let us shoot ourselves in the foot
if (victim == LocalPlayer) {