From 074e6d8b627cbae0d69fcd2de6127e4abba64eff Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 29 Oct 2017 21:43:42 +0100 Subject: [PATCH] Fix code to work with engine update --- Content.Server/EntryPoint.cs | 4 + Resources/Prototypes/Entities/Mobs.yml | 2 +- Resources/SavedEntities.xml | 600 ++++++++++++------------- 3 files changed, 305 insertions(+), 301 deletions(-) diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index dae7cb70d9..2be573d8ce 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -1,5 +1,6 @@ using Content.Server.GameObjects; using Content.Server.Interfaces.GameObjects; +using SS14.Server.Interfaces.Player; using SS14.Shared.ContentPack; using SS14.Shared.Interfaces.GameObjects; using SS14.Shared.IoC; @@ -28,6 +29,9 @@ namespace Content.Server factory.Register(); factory.Register(); factory.Register(); + + var playerManager = IoCManager.Resolve(); + playerManager.PlayerPrototypeName = "HumanMob_Content"; } } } diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml index 6e829fec7e..ca92cfc035 100644 --- a/Resources/Prototypes/Entities/Mobs.yml +++ b/Resources/Prototypes/Entities/Mobs.yml @@ -1,7 +1,7 @@ - type: entity name: Urist McHands id: HumanMob_Content - parent: HumanMob + parent: __engine_human components: - type: Hands hands: diff --git a/Resources/SavedEntities.xml b/Resources/SavedEntities.xml index e46e069abc..27a5fb33db 100644 --- a/Resources/SavedEntities.xml +++ b/Resources/SavedEntities.xml @@ -1,304 +1,304 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +