From f5fd39eaf05baec900b99c6c4cf0922256ac6f46 Mon Sep 17 00:00:00 2001 From: Treeku Date: Fri, 6 Jun 2014 04:30:10 +0100 Subject: [PATCH] Attempt to fix roadmap/.py error --- scripts/object/mobile/vehicle/landspeeder_av21.py | 1 - scripts/object/mobile/vehicle/speederbike_swoop.py | 1 - src/resources/datatables/Professions.java | 4 ++++ src/services/CharacterService.java | 4 ++++ src/services/PlayerService.java | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/object/mobile/vehicle/landspeeder_av21.py b/scripts/object/mobile/vehicle/landspeeder_av21.py index 0f6896cd..73ca0680 100644 --- a/scripts/object/mobile/vehicle/landspeeder_av21.py +++ b/scripts/object/mobile/vehicle/landspeeder_av21.py @@ -2,5 +2,4 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'creature/vehicle') - object.setAttachment('passengers', 0) return \ No newline at end of file diff --git a/scripts/object/mobile/vehicle/speederbike_swoop.py b/scripts/object/mobile/vehicle/speederbike_swoop.py index 0f6896cd..73ca0680 100644 --- a/scripts/object/mobile/vehicle/speederbike_swoop.py +++ b/scripts/object/mobile/vehicle/speederbike_swoop.py @@ -2,5 +2,4 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'creature/vehicle') - object.setAttachment('passengers', 0) return \ No newline at end of file diff --git a/src/resources/datatables/Professions.java b/src/resources/datatables/Professions.java index 0c6b76e1..43f68c64 100644 --- a/src/resources/datatables/Professions.java +++ b/src/resources/datatables/Professions.java @@ -47,4 +47,8 @@ public final class Professions { return map.get(profession); } + public static boolean isProfession(String profession) { + return map.containsKey(profession); + } + } diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index ec5a49c1..b91ae9b4 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -228,6 +228,10 @@ public class CharacterService implements INetworkDispatch { ClientCreateCharacter clientCreateCharacter = new ClientCreateCharacter(); clientCreateCharacter.deserialize(data); + if (!Professions.isProfession(clientCreateCharacter.getProfession())) { + return; + } + engine.resources.config.Config config = new engine.resources.config.Config(); config.setFilePath("nge.cfg"); if (!(config.loadConfigFile())) { diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index f7612765..0c61f37b 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -573,7 +573,7 @@ public class PlayerService implements INetworkDispatch { return; } - if (profession == null || profession.equals("")) { + if (profession == null || !Professions.isProfession(profession)) { return; }