diff --git a/l2jserver2-gameserver/data/template/npc/friendlymob/31845-BloodyPixy.xml b/l2jserver2-gameserver/data/template/npc/friendlymob/31845-BloodyPixy.xml new file mode 100644 index 000000000..c6a4087a3 --- /dev/null +++ b/l2jserver2-gameserver/data/template/npc/friendlymob/31845-BloodyPixy.xml @@ -0,0 +1,47 @@ + + + + Bloody Pixy + 80 + FAIRIE + FEMALE + + + + + + + + + + + + + + + 7680 + 226 + + + + Bloody Pixy:
+The weak spirits of darkness cannot protect the forest with their own powers and are receiving assistance from the Bloody Pixies. Wretched cowards they are, hiding in the ground, afraid of light!!
+Thanks to them, we deal with invaders and outlaws by our own hands. If you violate the laws here, You will know why we are called the Bloody Pixies. Better be careful!
+Quest +]]> + + + + + + + + + + + + + diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java index f204b7bc9..86f340e59 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java @@ -29,5 +29,6 @@ public class L2JConstant { *

* This MUST be hard-coded! */ - public static final ProtocolVersion SUPPORTED_PROTOCOL = ProtocolVersion.FREYA; + //public static final ProtocolVersion SUPPORTED_PROTOCOL = ProtocolVersion.FREYA; + public static final ProtocolVersion SUPPORTED_PROTOCOL = ProtocolVersion.INTERLUDE; } diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java index ad2f9b0c9..48f910cc0 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java @@ -48,8 +48,7 @@ public class TeleporterController extends BaseNPCController { if (args.length >= 2) { switch (args[0]) { case "goto": - final TeleportationTemplate tele = teleportationIdProvider - .resolveID(Integer.parseInt(args[1])).getTemplate(); + final TeleportationTemplate tele = teleportationIdProvider.resolveID(Integer.parseInt(args[1])).getTemplate(); if (tele == null) { throw new NPCControllerException(); } diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java index f36d8a23e..d395aebee 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java @@ -23,9 +23,12 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.l2jserver.model.id.object.CharacterID; +import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.AbstractService; +import com.l2jserver.service.ServiceException; +import com.l2jserver.service.game.item.ItemService; import com.l2jserver.service.game.spawn.CharacterAlreadyTeleportingServiceException; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnService; @@ -53,6 +56,12 @@ public class AdministratorServiceImpl extends AbstractService implements */ @SuppressWarnings("unused") private List online; + + @Inject + private ItemService itemService; + + @Inject + private ItemTemplateIDProvider itidProvider; /** * @param spawnService @@ -66,7 +75,7 @@ public class AdministratorServiceImpl extends AbstractService implements @Override public void command(Lineage2Client conn, L2Character character, String command, String... args) throws NotSpawnedServiceException, - CharacterAlreadyTeleportingServiceException { + CharacterAlreadyTeleportingServiceException, ServiceException { log.debug("{} is opening admin control panel", character); switch (command) { case "tele": @@ -79,8 +88,12 @@ public class AdministratorServiceImpl extends AbstractService implements Integer.parseInt(args[1]), Integer.parseInt(args[2]))); break; - default: + case "give": +// conn.sendMessage( "adding " + itidProvider.resolveID(57).getTemplate().getName() ); + character.getInventory().add( itemService.create(itidProvider.resolveID(57).getTemplate(), 10000) ); break; + default: + throw new ServiceException(); } } } diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java index 8c801ee18..90896b656 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java @@ -103,7 +103,7 @@ public class MapperPathingService extends AbstractService implements @Override protected void doStart() throws ServiceStartException { try { - final java.nio.file.Path dbFile = vfsService.resolveDataFile(file); + final java.nio.file.Path dbFile = vfsService.resolveDataFile(file.toString()); this.channel = Files.newByteChannel(dbFile, CREATE, APPEND, WRITE); } catch (IOException e) { throw new ServiceStartException( diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java index 2586ee061..f5133d38a 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java @@ -28,9 +28,9 @@ public enum ProtocolVersion { */ RELEASE(0), /** - * The Interlude(200) version + * The Interlude(746) version */ - INTERLUDE(200, RELEASE), + INTERLUDE(746, RELEASE), /** * The Freya(216) version */ @@ -39,7 +39,7 @@ public enum ProtocolVersion { * The High5(268) version */ HIGH5(268, FREYA); - + /** * The parent version */ diff --git a/l2jserver2-gameserver/pom.xml b/l2jserver2-gameserver/pom.xml index 3a395e755..56b940fc1 100644 --- a/l2jserver2-gameserver/pom.xml +++ b/l2jserver2-gameserver/pom.xml @@ -16,7 +16,8 @@ l2jserver2-gameserver-core - l2jserver2-gameserver-freya + + l2jserver2-gameserver-interlude diff --git a/pom.xml b/pom.xml index 6d753fa5c..40b369e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -153,6 +153,11 @@ + + l2jserver2 + l2jserver2-gameserver-interlude + 0.0.2 + @@ -191,6 +196,7 @@ 1.7 1.7 + true UTF-8