diff --git a/src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java b/src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java index a49c9c4ea..2ebf45a8a 100644 --- a/src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java +++ b/src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java @@ -59,7 +59,6 @@ public class StaticTemplateService extends AbstractService implements public void addTemplate(Class> t) { final Template template = injector.getInstance(t); - System.out.println(template.getID() + " -> " + template); if (template.getID() != null) templates.put(template.getID(), template); } diff --git a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java index 91d17ee56..89bc75b05 100644 --- a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java +++ b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java @@ -16,6 +16,8 @@ import com.l2jserver.service.BasicServiceModule; import com.l2jserver.service.ServiceModule; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.database.DatabaseService; +import com.l2jserver.service.game.scripting.ScriptingService; +import com.l2jserver.service.game.template.TemplateService; public class IDFactoryTest { private final Injector injector = Guice.createInjector(new ServiceModule(), @@ -42,14 +44,17 @@ public class IDFactoryTest { @Test public void testGetObject() throws ServiceStartException { BasicConfigurator.configure(); + injector.getInstance(ScriptingService.class).start(); + injector.getInstance(TemplateService.class).start(); injector.getInstance(DatabaseService.class).start(); - final CharacterID id1 = charIdFactory.createID(268435456); - final L2Character character = id1.getObject(); + final CharacterID id = charIdFactory.createID(268437456); + final L2Character character = id.getObject(); + Assert.assertNotNull(character); System.out.println(character.getAppearance().getHairColor()); Assert.assertNotNull(character); - Assert.assertEquals(id1, character.getID()); + Assert.assertEquals(id, character.getID()); } } diff --git a/src/tool/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java b/src/tool/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java index e68daa325..2c449d84b 100644 --- a/src/tool/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java +++ b/src/tool/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java @@ -12,7 +12,8 @@ public class CharacterSQLEnumGenerator { final StringBuilder builder = new StringBuilder(); builder.append("ALTER TABLE `character` CHANGE `class` `class` ENUM("); for (CharacterClass c : CharacterClass.values()) { - builder.append("'" + c.name() + "',"); + if (!c.name().startsWith("DUMMY")) + builder.append("'" + c.name() + "',"); } builder.replace(builder.length() - 1, builder.length(), ""); builder.append(") CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'HUMAN_FIGHTER';");