1
0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00

Removes l2jserver2-site folder

This commit is contained in:
2011-10-22 02:22:47 -02:00
parent d9a2badd2d
commit d2bfca5700
18 changed files with 29 additions and 581 deletions

View File

@@ -11,7 +11,6 @@
<name>L2JServer 2 game server</name>
<description>This game server is responsible for communicating the game client with the game virtual world. It provides data storage and processing along with broadcasting positioning data to other connected clients.</description>
<url>http://github.com/l2jserver2</url>
<inceptionYear>2011</inceptionYear>
<build>

View File

@@ -32,6 +32,7 @@ import com.l2jserver.model.id.object.provider.NPCIDProvider;
import com.l2jserver.model.id.object.provider.NPCIDProvider.NPCIDGuiceFactory;
import com.l2jserver.model.id.object.provider.ObjectIDResolver;
import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider;
import com.l2jserver.model.id.template.provider.EffectTemplateIDProvider;
import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider;
import com.l2jserver.model.id.template.provider.SkillTemplateIDProvider;
@@ -74,6 +75,7 @@ public class IDProviderModule extends AbstractModule {
// TEMPLATE IDS
install(new FactoryModuleBuilder().build(ItemTemplateIDProvider.class));
install(new FactoryModuleBuilder().build(EffectTemplateIDProvider.class));
install(new FactoryModuleBuilder().build(SkillTemplateIDProvider.class));
install(new FactoryModuleBuilder()
.build(CharacterTemplateIDProvider.class));

View File

@@ -21,11 +21,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.EffectTemplateID;
import com.l2jserver.model.template.Template;
import com.l2jserver.model.world.Actor;
import com.l2jserver.model.world.actor.effect.Effect;
import com.l2jserver.util.jaxb.EffectTemplateIDAdapter;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
@@ -35,6 +37,7 @@ import com.l2jserver.model.world.actor.effect.Effect;
@XmlSeeAlso({ TeleportEffectTemplate.class })
public abstract class EffectTemplate implements Template {
@XmlAttribute(name = "id")
@XmlJavaTypeAdapter(EffectTemplateIDAdapter.class)
protected EffectTemplateID id;
protected EffectTemplate() {

View File

@@ -19,7 +19,9 @@ package com.l2jserver.model.template.effect;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.google.inject.Inject;
import com.l2jserver.model.world.Actor;
@@ -29,6 +31,7 @@ import com.l2jserver.service.game.spawn.CharacterAlreadyTeleportingServiceExcept
import com.l2jserver.service.game.spawn.NotSpawnedServiceException;
import com.l2jserver.service.game.spawn.SpawnService;
import com.l2jserver.util.geometry.Coordinate;
import com.l2jserver.util.jaxb.CoordinateAdapter;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
@@ -42,7 +45,8 @@ public class TeleportEffectTemplate extends EffectTemplate {
@XmlAttribute(name = "type", required = false)
private SkillTeleportEffectLocation type = SkillTeleportEffectLocation.TARGET;
@XmlAttribute(name = "point")
@XmlElement(name = "point")
@XmlJavaTypeAdapter(CoordinateAdapter.class)
private Coordinate coordinate;
/**