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

Source code cleanup

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-03-25 15:57:51 -03:00
parent 10cb453d4a
commit 1084905350
109 changed files with 6961 additions and 7236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java vendored
View File

@@ -186,7 +186,8 @@ public class SoftCacheService extends AbstractService implements CacheService {
while ((en = (SoftEntry) refQueue.poll()) != null) {
K key = en.getKey();
if (log.isDebugEnabled())
log.debug("{} : cleaned up value for key: {}", cacheName, key);
log.debug("{} : cleaned up value for key: {}", cacheName,
key);
cacheMap.remove(key);
}
}

3
l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java vendored
View File

@@ -185,7 +185,8 @@ public class WeakCacheService extends AbstractService implements CacheService {
while ((en = (Entry) refQueue.poll()) != null) {
K key = en.getKey();
if (log.isDebugEnabled())
log.debug("{}: cleaned up value for key: {}", cacheName, key);
log.debug("{}: cleaned up value for key: {}", cacheName,
key);
cacheMap.remove(key);
}
}

3
l2jserver2-common/src/main/java/com/l2jserver/service/core/logging/Log4JLoggingService.java
View File

@@ -52,8 +52,7 @@ public class Log4JLoggingService extends
@Override
protected void doStart() throws ServiceStartException {
final Layout layout = new PatternLayout(
"[%p %d] %c{1} - %m%n");
final Layout layout = new PatternLayout("[%p %d] %c{1} - %m%n");
rootLogger = Logger.getRootLogger();
rootLogger.removeAllAppenders();

3
l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPoolPriority.java
View File

@@ -50,7 +50,8 @@ public enum ThreadPoolPriority {
public final int threadPriority;
/**
* @param threadPriority the {@link Thread} priority {@link Integer} index
* @param threadPriority
* the {@link Thread} priority {@link Integer} index
*/
ThreadPoolPriority(int threadPriority) {
this.threadPriority = threadPriority;

1
l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java
View File

@@ -88,7 +88,6 @@ public class Java7VFSService extends
return dataRoot.resolve(path);
}
@Override
protected void doStop() throws ServiceStopException {
root = null;

2
l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/QueryFactory.java
View File

@@ -19,10 +19,10 @@ package com.l2jserver.service.database.ddl;
import java.util.List;
import com.l2jserver.service.database.ddl.struct.Column;
import com.l2jserver.service.database.ddl.struct.Column.ColumnType;
import com.l2jserver.service.database.ddl.struct.ForeignKey;
import com.l2jserver.service.database.ddl.struct.PrimaryKey;
import com.l2jserver.service.database.ddl.struct.Table;
import com.l2jserver.service.database.ddl.struct.Column.ColumnType;
import com.l2jserver.util.factory.CollectionFactory;
/**

21
l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/struct/Table.java
View File

@@ -47,10 +47,14 @@ public class Table {
private final List<ForeignKey> foreignKeys = CollectionFactory.newList();
/**
* @param name the table name
* @param columns the column
* @param primaryKey the primary key
* @param foreignKeys the foreign keys
* @param name
* the table name
* @param columns
* the column
* @param primaryKey
* the primary key
* @param foreignKeys
* the foreign keys
*/
public Table(String name, Map<String, Column> columns,
PrimaryKey primaryKey, List<ForeignKey> foreignKeys) {
@@ -62,8 +66,10 @@ public class Table {
}
/**
* @param name the table name
* @param primaryKey the primary key
* @param name
* the table name
* @param primaryKey
* the primary key
*/
public Table(String name, PrimaryKey primaryKey) {
this.name = name;
@@ -104,7 +110,8 @@ public class Table {
}
/**
* @param name the column name
* @param name
* the column name
* @return the column represented by <code>name</code>
*/
public Column getColumn(String name) {

3
l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java
View File

@@ -1103,7 +1103,8 @@ public abstract class AbstractSQLDatabaseService extends
*
* @param q
* the query clause
* @param e the entity
* @param e
* the entity
*/
protected abstract void query(AbstractSQLQuery<?> q, E e);
}

13
l2jserver2-common/src/main/java/com/l2jserver/util/QPathUtils.java
View File

@@ -57,7 +57,8 @@ public class QPathUtils {
* @return the {@link Field} holding <code>path</code>
*/
public static Field getReflectionField(Path<?> path) {
return ClassUtils.getFieldWithValue(path.getMetadata().getParent(), path);
return ClassUtils.getFieldWithValue(path.getMetadata().getParent(),
path);
}
/**
@@ -81,7 +82,7 @@ public class QPathUtils {
*/
public static int getColumnSize(Path<?> path) {
final Field field = getReflectionField(path);
if(field == null)
if (field == null)
return 0;
final ColumnSize size = field.getAnnotation(ColumnSize.class);
if (size != null)
@@ -96,7 +97,7 @@ public class QPathUtils {
*/
public static boolean isAutoIncrementable(Path<?> path) {
final Field field = getReflectionField(path);
if(field == null)
if (field == null)
return false;
final ColumnAutoIncrement autoInc = field
.getAnnotation(ColumnAutoIncrement.class);
@@ -112,7 +113,7 @@ public class QPathUtils {
*/
public static boolean isNullable(Path<?> path) {
final Field field = getReflectionField(path);
if(field == null)
if (field == null)
return false;
final ColumnNullable nullable = field
.getAnnotation(ColumnNullable.class);
@@ -130,7 +131,7 @@ public class QPathUtils {
*/
public static boolean hasDefaultValue(Path<?> path) {
final Field field = getReflectionField(path);
if(field == null)
if (field == null)
return false;
final ColumnDefault def = field.getAnnotation(ColumnDefault.class);
if (def == null) {
@@ -147,7 +148,7 @@ public class QPathUtils {
*/
public static String getDefaultUntransformedValue(Path<?> path) {
final Field field = getReflectionField(path);
if(field == null)
if (field == null)
return null;
final ColumnDefault def = field.getAnnotation(ColumnDefault.class);
if (def != null)

2
l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java
View File

@@ -82,7 +82,7 @@ public class TransformerFactory {
return PathTransformer.SHARED_INSTANCE;
} else if (type.isEnum()) {
return EnumTransformer.SHARED_INSTANCE;
} else if(type.isArray()) {
} else if (type.isArray()) {
return ArrayTransformer.SHARED_INSTANCE;
} else if (type == String.class)
return StringTransformer.SHARED_INSTANCE;

4
l2jserver2-common/src/test/java/com/l2jserver/util/ArrayUtilsTest.java
View File

@@ -47,6 +47,7 @@ public class ArrayUtilsTest extends ArrayUtils {
/**
* Simple test class
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
private static class TestClass {
@@ -56,7 +57,8 @@ public class ArrayUtilsTest extends ArrayUtils {
private String name;
/**
* @param string the name
* @param string
* the name
*/
public TestClass(String string) {
this.name = string;

22
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java
View File

@@ -5,7 +5,6 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for AbstractTemplate complex type.
* <p>
* Java class for AbstractTemplate complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType name="AbstractTemplate">
@@ -34,15 +35,8 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "AbstractTemplate")
@XmlSeeAlso({
ItemTemplate.class,
ActorTemplate.class,
SkillTemplate.class,
com.l2jserver.model.template.Teleports.Teleport.class
})
public abstract class AbstractTemplate
implements Template
{
@XmlSeeAlso({ ItemTemplate.class, ActorTemplate.class, SkillTemplate.class,
com.l2jserver.model.template.Teleports.Teleport.class })
public abstract class AbstractTemplate implements Template {
}

19
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
View File

@@ -5,7 +5,6 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for ActorTemplate complex type.
* <p>
* Java class for ActorTemplate complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType name="ActorTemplate">
@@ -32,13 +33,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ActorTemplate")
@XmlSeeAlso({
CharacterTemplate.class,
NPCTemplate.class
})
public abstract class ActorTemplate
extends AbstractTemplate
{
@XmlSeeAlso({ CharacterTemplate.class, NPCTemplate.class })
public abstract class ActorTemplate extends AbstractTemplate {
}

189
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
View File

@@ -5,18 +5,19 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for CalculatorFunction complex type.
* <p>
* Java class for CalculatorFunction complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType name="CalculatorFunction">
@@ -36,113 +37,97 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CalculatorFunction", propOrder = {
"set",
"add",
"subtract",
"random"
})
@XmlType(name = "CalculatorFunction", propOrder = { "set", "add", "subtract",
"random" })
public class CalculatorFunction {
protected CalculatorFunctionOperation set;
protected CalculatorFunctionOperation add;
protected CalculatorFunctionOperation subtract;
protected CalculatorFunctionOperation random;
protected CalculatorFunctionOperation set;
protected CalculatorFunctionOperation add;
protected CalculatorFunctionOperation subtract;
protected CalculatorFunctionOperation random;
/**
* Gets the value of the set property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSet() {
return set;
}
/**
* Gets the value of the set property.
*
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSet() {
return set;
}
/**
* Sets the value of the set property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setSet(CalculatorFunctionOperation value) {
this.set = value;
}
/**
* Sets the value of the set property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setSet(CalculatorFunctionOperation value) {
this.set = value;
}
/**
* Gets the value of the add property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getAdd() {
return add;
}
/**
* Gets the value of the add property.
*
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getAdd() {
return add;
}
/**
* Sets the value of the add property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setAdd(CalculatorFunctionOperation value) {
this.add = value;
}
/**
* Sets the value of the add property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setAdd(CalculatorFunctionOperation value) {
this.add = value;
}
/**
* Gets the value of the subtract property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSubtract() {
return subtract;
}
/**
* Gets the value of the subtract property.
*
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSubtract() {
return subtract;
}
/**
* Sets the value of the subtract property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setSubtract(CalculatorFunctionOperation value) {
this.subtract = value;
}
/**
* Sets the value of the subtract property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setSubtract(CalculatorFunctionOperation value) {
this.subtract = value;
}
/**
* Gets the value of the random property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getRandom() {
return random;
}
/**
* Gets the value of the random property.
*
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getRandom() {
return random;
}
/**
* Sets the value of the random property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setRandom(CalculatorFunctionOperation value) {
this.random = value;
}
/**
* Sets the value of the random property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setRandom(CalculatorFunctionOperation value) {
this.random = value;
}
}

87
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
View File

@@ -5,20 +5,22 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for CalculatorFunctionOperation complex type.
* <p>
* Java class for CalculatorFunctionOperation complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType name="CalculatorFunctionOperation">
@@ -37,49 +39,46 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "CalculatorFunctionOperation")
public class CalculatorFunctionOperation {
@XmlAttribute(name = "order", required = true)
protected BigInteger order;
@XmlAttribute(name = "value", required = true)
protected double value;
@XmlAttribute(name = "order", required = true)
protected BigInteger order;
@XmlAttribute(name = "value", required = true)
protected double value;
/**
* Gets the value of the order property.
*
* @return
* possible object is
* {@link BigInteger }
*
*/
public BigInteger getOrder() {
return order;
}
/**
* Gets the value of the order property.
*
* @return possible object is {@link BigInteger }
*
*/
public BigInteger getOrder() {
return order;
}
/**
* Sets the value of the order property.
*
* @param value
* allowed object is
* {@link BigInteger }
*
*/
public void setOrder(BigInteger value) {
this.order = value;
}
/**
* Sets the value of the order property.
*
* @param value
* allowed object is {@link BigInteger }
*
*/
public void setOrder(BigInteger value) {
this.order = value;
}
/**
* Gets the value of the value property.
*
*/
public double getValue() {
return value;
}
/**
* Gets the value of the value property.
*
*/
public double getValue() {
return value;
}
/**
* Sets the value of the value property.
*
*/
public void setValue(double value) {
this.value = value;
}
/**
* Sets the value of the value property.
*
*/
public void setValue(double value) {
this.value = value;
}
}

3311
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
View File

File diff suppressed because it is too large Load Diff

105
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java
View File

@@ -5,7 +5,6 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for Coordinate complex type.
* <p>
* Java class for Coordinate complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType name="Coordinate">
@@ -39,59 +40,59 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "Coordinate")
public class Coordinate {
@XmlAttribute(name = "x", required = true)
protected int x;
@XmlAttribute(name = "y", required = true)
protected int y;
@XmlAttribute(name = "z", required = true)
protected int z;
@XmlAttribute(name = "x", required = true)
protected int x;
@XmlAttribute(name = "y", required = true)
protected int y;
@XmlAttribute(name = "z", required = true)
protected int z;
/**
* Gets the value of the x property.
*
*/
public int getX() {
return x;
}
/**
* Gets the value of the x property.
*
*/
public int getX() {
return x;
}
/**
* Sets the value of the x property.
*
*/
public void setX(int value) {
this.x = value;
}
/**
* Sets the value of the x property.
*
*/
public void setX(int value) {
this.x = value;
}
/**
* Gets the value of the y property.
*
*/
public int getY() {
return y;
}
/**
* Gets the value of the y property.
*
*/
public int getY() {
return y;
}
/**
* Sets the value of the y property.
*
*/
public void setY(int value) {
this.y = value;
}
/**
* Sets the value of the y property.
*
*/
public void setY(int value) {
this.y = value;
}
/**
* Gets the value of the z property.
*
*/
public int getZ() {
return z;
}
/**
* Gets the value of the z property.
*
*/
public int getZ() {
return z;
}
/**
* Sets the value of the z property.
*
*/
public void setZ(int value) {
this.z = value;
}
/**
* Sets the value of the z property.
*
*/
public void setZ(int value) {
this.z = value;
}
}

1983
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
View File

File diff suppressed because it is too large Load Diff

5759
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
View File

File diff suppressed because it is too large Load Diff

903
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
View File

@@ -5,531 +5,526 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlRegistry;
/**
* This object contains factory methods for each
* Java content interface and Java element interface
* generated in the com.l2jserver.model.template package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
* content can consist of schema derived interfaces
* and classes representing the binding of schema
* type definitions, element declarations and model
* groups. Factory methods for each of these are
* provided in this class.
* This object contains factory methods for each Java content interface and Java
* element interface generated in the com.l2jserver.model.template package.
* <p>
* An ObjectFactory allows you to programatically construct new instances of the
* Java representation for XML content. The Java representation of XML content
* can consist of schema derived interfaces and classes representing the binding
* of schema type definitions, element declarations and model groups. Factory
* methods for each of these are provided in this class.
*
*/
@XmlRegistry
public class ObjectFactory {
/**
* Create a new ObjectFactory that can be used to create new instances of
* schema derived classes for package: com.l2jserver.model.template
*
*/
public ObjectFactory() {
}
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template
*
*/
public ObjectFactory() {
}
/**
* Create an instance of {@link NPCTemplate }
*
*/
public NPCTemplate createNPCTemplate() {
return new NPCTemplate();
}
/**
* Create an instance of {@link NPCTemplate }
*
*/
public NPCTemplate createNPCTemplate() {
return new NPCTemplate();
}
/**
* Create an instance of {@link NPCTemplate.Droplist }
*
*/
public NPCTemplate.Droplist createNPCTemplateDroplist() {
return new NPCTemplate.Droplist();
}
/**
* Create an instance of {@link NPCTemplate.Droplist }
*
*/
public NPCTemplate.Droplist createNPCTemplateDroplist() {
return new NPCTemplate.Droplist();
}
/**
* Create an instance of {@link NPCTemplate.Droplist.Item }
*
*/
public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
return new NPCTemplate.Droplist.Item();
}
/**
* Create an instance of {@link NPCTemplate.Droplist.Item }
*
*/
public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
return new NPCTemplate.Droplist.Item();
}
/**
* Create an instance of {@link Teleports }
*
*/
public Teleports createTeleports() {
return new Teleports();
}
/**
* Create an instance of {@link Teleports }
*
*/
public Teleports createTeleports() {
return new Teleports();
}
/**
* Create an instance of {@link Zones }
*
*/
public Zones createZones() {
return new Zones();
}
/**
* Create an instance of {@link Zones }
*
*/
public Zones createZones() {
return new Zones();
}
/**
* Create an instance of {@link ZoneType }
*
*/
public ZoneType createZoneType() {
return new ZoneType();
}
/**
* Create an instance of {@link ZoneType }
*
*/
public ZoneType createZoneType() {
return new ZoneType();
}
/**
* Create an instance of {@link Zones.Castle }
*
*/
public Zones.Castle createZonesCastle() {
return new Zones.Castle();
}
/**
* Create an instance of {@link Zones.Castle }
*
*/
public Zones.Castle createZonesCastle() {
return new Zones.Castle();
}
/**
* Create an instance of {@link Teleports.Teleport }
*
*/
public Teleports.Teleport createTeleportsTeleport() {
return new Teleports.Teleport();
}
/**
* Create an instance of {@link Teleports.Teleport }
*
*/
public Teleports.Teleport createTeleportsTeleport() {
return new Teleports.Teleport();
}
/**
* Create an instance of {@link NPCTemplate.Skills }
*
*/
public NPCTemplate.Skills createNPCTemplateSkills() {
return new NPCTemplate.Skills();
}
/**
* Create an instance of {@link NPCTemplate.Skills }
*
*/
public NPCTemplate.Skills createNPCTemplateSkills() {
return new NPCTemplate.Skills();
}
/**
* Create an instance of {@link NPCTemplate.Talk }
*
*/
public NPCTemplate.Talk createNPCTemplateTalk() {
return new NPCTemplate.Talk();
}
/**
* Create an instance of {@link NPCTemplate.Talk }
*
*/
public NPCTemplate.Talk createNPCTemplateTalk() {
return new NPCTemplate.Talk();
}
/**
* Create an instance of {@link NPCTemplate.Info }
*
*/
public NPCTemplate.Info createNPCTemplateInfo() {
return new NPCTemplate.Info();
}
/**
* Create an instance of {@link NPCTemplate.Info }
*
*/
public NPCTemplate.Info createNPCTemplateInfo() {
return new NPCTemplate.Info();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats }
*
*/
public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
return new NPCTemplate.Info.Stats();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats }
*
*/
public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
return new NPCTemplate.Info.Stats();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Defense }
*
*/
public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
return new NPCTemplate.Info.Stats.Defense();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Defense }
*
*/
public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
return new NPCTemplate.Info.Stats.Defense();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Attack }
*
*/
public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
return new NPCTemplate.Info.Stats.Attack();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Attack }
*
*/
public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
return new NPCTemplate.Info.Stats.Attack();
}
/**
* Create an instance of {@link ItemTemplate }
*
*/
public ItemTemplate createItemTemplate() {
return new ItemTemplate();
}
/**
* Create an instance of {@link ItemTemplate }
*
*/
public ItemTemplate createItemTemplate() {
return new ItemTemplate();
}
/**
* Create an instance of {@link ItemTemplate.Armor }
*
*/
public ItemTemplate.Armor createItemTemplateArmor() {
return new ItemTemplate.Armor();
}
/**
* Create an instance of {@link ItemTemplate.Armor }
*
*/
public ItemTemplate.Armor createItemTemplateArmor() {
return new ItemTemplate.Armor();
}
/**
* Create an instance of {@link ItemTemplate.Attributes }
*
*/
public ItemTemplate.Attributes createItemTemplateAttributes() {
return new ItemTemplate.Attributes();
}
/**
* Create an instance of {@link ItemTemplate.Attributes }
*
*/
public ItemTemplate.Attributes createItemTemplateAttributes() {
return new ItemTemplate.Attributes();
}
/**
* Create an instance of {@link CharacterTemplate }
*
*/
public CharacterTemplate createCharacterTemplate() {
return new CharacterTemplate();
}
/**
* Create an instance of {@link CharacterTemplate }
*
*/
public CharacterTemplate createCharacterTemplate() {
return new CharacterTemplate();
}
/**
* Create an instance of {@link CharacterTemplate.Collision }
*
*/
public CharacterTemplate.Collision createCharacterTemplateCollision() {
return new CharacterTemplate.Collision();
}
/**
* Create an instance of {@link CharacterTemplate.Collision }
*
*/
public CharacterTemplate.Collision createCharacterTemplateCollision() {
return new CharacterTemplate.Collision();
}
/**
* Create an instance of {@link CharacterTemplate.Stats }
*
*/
public CharacterTemplate.Stats createCharacterTemplateStats() {
return new CharacterTemplate.Stats();
}
/**
* Create an instance of {@link CharacterTemplate.Stats }
*
*/
public CharacterTemplate.Stats createCharacterTemplateStats() {
return new CharacterTemplate.Stats();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Defense }
*
*/
public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
return new CharacterTemplate.Stats.Defense();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Defense }
*
*/
public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
return new CharacterTemplate.Stats.Defense();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Attack }
*
*/
public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
return new CharacterTemplate.Stats.Attack();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Attack }
*
*/
public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
return new CharacterTemplate.Stats.Attack();
}
/**
* Create an instance of {@link CalculatorFunction }
*
*/
public CalculatorFunction createCalculatorFunction() {
return new CalculatorFunction();
}
/**
* Create an instance of {@link CalculatorFunction }
*
*/
public CalculatorFunction createCalculatorFunction() {
return new CalculatorFunction();
}
/**
* Create an instance of {@link Coordinate }
*
*/
public Coordinate createCoordinate() {
return new Coordinate();
}
/**
* Create an instance of {@link Coordinate }
*
*/
public Coordinate createCoordinate() {
return new Coordinate();
}
/**
* Create an instance of {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation createCalculatorFunctionOperation() {
return new CalculatorFunctionOperation();
}
/**
* Create an instance of {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation createCalculatorFunctionOperation() {
return new CalculatorFunctionOperation();
}
/**
* Create an instance of {@link SkillTemplate }
*
*/
public SkillTemplate createSkillTemplate() {
return new SkillTemplate();
}
/**
* Create an instance of {@link SkillTemplate }
*
*/
public SkillTemplate createSkillTemplate() {
return new SkillTemplate();
}
/**
* Create an instance of {@link ZoneType.Point }
*
*/
public ZoneType.Point createZoneTypePoint() {
return new ZoneType.Point();
}
/**
* Create an instance of {@link ZoneType.Point }
*
*/
public ZoneType.Point createZoneTypePoint() {
return new ZoneType.Point();
}
/**
* Create an instance of {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege createZonesCastleSiege() {
return new Zones.Castle.Siege();
}
/**
* Create an instance of {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege createZonesCastleSiege() {
return new Zones.Castle.Siege();
}
/**
* Create an instance of {@link Teleports.Teleport.Restrictions }
*
*/
public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
return new Teleports.Teleport.Restrictions();
}
/**
* Create an instance of {@link Teleports.Teleport.Restrictions }
*
*/
public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
return new Teleports.Teleport.Restrictions();
}
/**
* Create an instance of {@link NPCTemplate.Ai }
*
*/
public NPCTemplate.Ai createNPCTemplateAi() {
return new NPCTemplate.Ai();
}
/**
* Create an instance of {@link NPCTemplate.Ai }
*
*/
public NPCTemplate.Ai createNPCTemplateAi() {
return new NPCTemplate.Ai();
}
/**
* Create an instance of {@link NPCTemplate.Skills.Skill }
*
*/
public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
return new NPCTemplate.Skills.Skill();
}
/**
* Create an instance of {@link NPCTemplate.Skills.Skill }
*
*/
public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
return new NPCTemplate.Skills.Skill();
}
/**
* Create an instance of {@link NPCTemplate.Talk.Chat }
*
*/
public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
return new NPCTemplate.Talk.Chat();
}
/**
* Create an instance of {@link NPCTemplate.Talk.Chat }
*
*/
public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
return new NPCTemplate.Talk.Chat();
}
/**
* Create an instance of {@link NPCTemplate.Info.Name }
*
*/
public NPCTemplate.Info.Name createNPCTemplateInfoName() {
return new NPCTemplate.Info.Name();
}
/**
* Create an instance of {@link NPCTemplate.Info.Name }
*
*/
public NPCTemplate.Info.Name createNPCTemplateInfoName() {
return new NPCTemplate.Info.Name();
}
/**
* Create an instance of {@link NPCTemplate.Info.Title }
*
*/
public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
return new NPCTemplate.Info.Title();
}
/**
* Create an instance of {@link NPCTemplate.Info.Title }
*
*/
public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
return new NPCTemplate.Info.Title();
}
/**
* Create an instance of {@link NPCTemplate.Info.Item }
*
*/
public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
return new NPCTemplate.Info.Item();
}
/**
* Create an instance of {@link NPCTemplate.Info.Item }
*
*/
public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
return new NPCTemplate.Info.Item();
}
/**
* Create an instance of {@link NPCTemplate.Info.Collision }
*
*/
public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
return new NPCTemplate.Info.Collision();
}
/**
* Create an instance of {@link NPCTemplate.Info.Collision }
*
*/
public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
return new NPCTemplate.Info.Collision();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Hp }
*
*/
public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
return new NPCTemplate.Info.Stats.Hp();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Hp }
*
*/
public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
return new NPCTemplate.Info.Stats.Hp();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Mp }
*
*/
public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
return new NPCTemplate.Info.Stats.Mp();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Mp }
*
*/
public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
return new NPCTemplate.Info.Stats.Mp();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Move }
*
*/
public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
return new NPCTemplate.Info.Stats.Move();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Move }
*
*/
public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
return new NPCTemplate.Info.Stats.Move();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Base }
*
*/
public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
return new NPCTemplate.Info.Stats.Base();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Base }
*
*/
public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
return new NPCTemplate.Info.Stats.Base();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
*
*/
public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
return new NPCTemplate.Info.Stats.Defense.Physical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
*
*/
public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
return new NPCTemplate.Info.Stats.Defense.Physical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
*
*/
public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
return new NPCTemplate.Info.Stats.Defense.Magical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
*
*/
public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
return new NPCTemplate.Info.Stats.Defense.Magical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
*
*/
public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
return new NPCTemplate.Info.Stats.Attack.Physical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
*
*/
public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
return new NPCTemplate.Info.Stats.Attack.Physical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
*
*/
public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
return new NPCTemplate.Info.Stats.Attack.Magical();
}
/**
* Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
*
*/
public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
return new NPCTemplate.Info.Stats.Attack.Magical();
}
/**
* Create an instance of {@link ItemTemplate.Controller }
*
*/
public ItemTemplate.Controller createItemTemplateController() {
return new ItemTemplate.Controller();
}
/**
* Create an instance of {@link ItemTemplate.Controller }
*
*/
public ItemTemplate.Controller createItemTemplateController() {
return new ItemTemplate.Controller();
}
/**
* Create an instance of {@link ItemTemplate.Effect }
*
*/
public ItemTemplate.Effect createItemTemplateEffect() {
return new ItemTemplate.Effect();
}
/**
* Create an instance of {@link ItemTemplate.Effect }
*
*/
public ItemTemplate.Effect createItemTemplateEffect() {
return new ItemTemplate.Effect();
}
/**
* Create an instance of {@link ItemTemplate.EtcItem }
*
*/
public ItemTemplate.EtcItem createItemTemplateEtcItem() {
return new ItemTemplate.EtcItem();
}
/**
* Create an instance of {@link ItemTemplate.EtcItem }
*
*/
public ItemTemplate.EtcItem createItemTemplateEtcItem() {
return new ItemTemplate.EtcItem();
}
/**
* Create an instance of {@link ItemTemplate.Weapon }
*
*/
public ItemTemplate.Weapon createItemTemplateWeapon() {
return new ItemTemplate.Weapon();
}
/**
* Create an instance of {@link ItemTemplate.Weapon }
*
*/
public ItemTemplate.Weapon createItemTemplateWeapon() {
return new ItemTemplate.Weapon();
}
/**
* Create an instance of {@link ItemTemplate.Armor.Cost }
*
*/
public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
return new ItemTemplate.Armor.Cost();
}
/**
* Create an instance of {@link ItemTemplate.Armor.Cost }
*
*/
public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
return new ItemTemplate.Armor.Cost();
}
/**
* Create an instance of {@link ItemTemplate.Armor.Equipment }
*
*/
public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
return new ItemTemplate.Armor.Equipment();
}
/**
* Create an instance of {@link ItemTemplate.Armor.Equipment }
*
*/
public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
return new ItemTemplate.Armor.Equipment();
}
/**
* Create an instance of {@link ItemTemplate.Attributes.Cost }
*
*/
public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
return new ItemTemplate.Attributes.Cost();
}
/**
* Create an instance of {@link ItemTemplate.Attributes.Cost }
*
*/
public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
return new ItemTemplate.Attributes.Cost();
}
/**
* Create an instance of {@link CharacterTemplate.Collision.Male }
*
*/
public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
return new CharacterTemplate.Collision.Male();
}
/**
* Create an instance of {@link CharacterTemplate.Collision.Male }
*
*/
public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
return new CharacterTemplate.Collision.Male();
}
/**
* Create an instance of {@link CharacterTemplate.Collision.Female }
*
*/
public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
return new CharacterTemplate.Collision.Female();
}
/**
* Create an instance of {@link CharacterTemplate.Collision.Female }
*
*/
public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
return new CharacterTemplate.Collision.Female();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Hp }
*
*/
public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
return new CharacterTemplate.Stats.Hp();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Hp }
*
*/
public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
return new CharacterTemplate.Stats.Hp();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Mp }
*
*/
public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
return new CharacterTemplate.Stats.Mp();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Mp }
*
*/
public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
return new CharacterTemplate.Stats.Mp();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Cp }
*
*/
public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
return new CharacterTemplate.Stats.Cp();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Cp }
*
*/
public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
return new CharacterTemplate.Stats.Cp();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Move }
*
*/
public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
return new CharacterTemplate.Stats.Move();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Move }
*
*/
public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
return new CharacterTemplate.Stats.Move();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Base }
*
*/
public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
return new CharacterTemplate.Stats.Base();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Base }
*
*/
public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
return new CharacterTemplate.Stats.Base();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
*
*/
public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
return new CharacterTemplate.Stats.Defense.Physical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
*
*/
public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
return new CharacterTemplate.Stats.Defense.Physical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
*
*/
public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
return new CharacterTemplate.Stats.Defense.Magical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
*
*/
public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
return new CharacterTemplate.Stats.Defense.Magical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
*
*/
public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
return new CharacterTemplate.Stats.Attack.Physical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
*
*/
public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
return new CharacterTemplate.Stats.Attack.Physical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
*
*/
public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
return new CharacterTemplate.Stats.Attack.Magical();
}
/**
* Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
*
*/
public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
return new CharacterTemplate.Stats.Attack.Magical();
}
}

204
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
View File

@@ -5,7 +5,6 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,14 +13,17 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.SkillTemplateID;
import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
/**
* <p>Java class for skill element declaration.
* <p>
* Java class for skill element declaration.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;element name="skill">
@@ -44,119 +46,109 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"maximumLevel"
})
@XmlType(name = "", propOrder = { "maximumLevel" })
@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
public class SkillTemplate
extends AbstractTemplate
{
public class SkillTemplate extends AbstractTemplate {
protected int maximumLevel;
@XmlAttribute(name = "id", required = true)
@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
protected SkillTemplateID id;
@XmlAttribute(name = "name", required = true)
protected String name;
@XmlAttribute(name = "delay", required = true)
protected int delay;
@XmlAttribute(name = "cooldown", required = true)
protected int cooldown;
protected int maximumLevel;
@XmlAttribute(name = "id", required = true)
@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
protected SkillTemplateID id;
@XmlAttribute(name = "name", required = true)
protected String name;
@XmlAttribute(name = "delay", required = true)
protected int delay;
@XmlAttribute(name = "cooldown", required = true)
protected int cooldown;
/**
* Gets the value of the maximumLevel property.
*
*/
public int getMaximumLevel() {
return maximumLevel;
}
/**
* Gets the value of the maximumLevel property.
*
*/
public int getMaximumLevel() {
return maximumLevel;
}
/**
* Sets the value of the maximumLevel property.
*
*/
public void setMaximumLevel(int value) {
this.maximumLevel = value;
}
/**
* Sets the value of the maximumLevel property.
*
*/
public void setMaximumLevel(int value) {
this.maximumLevel = value;
}
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
*
*/
public SkillTemplateID getID() {
return id;
}
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
*
*/
public SkillTemplateID getID() {
return id;
}
/**
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setID(SkillTemplateID value) {
this.id = value;
}
/**
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
*
*/
public void setID(SkillTemplateID value) {
this.id = value;
}
/**
* Gets the value of the name property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getName() {
return name;
}
/**
* Gets the value of the name property.
*
* @return possible object is {@link String }
*
*/
public String getName() {
return name;
}
/**
* Sets the value of the name property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setName(String value) {
this.name = value;
}
/**
* Sets the value of the name property.
*
* @param value
* allowed object is {@link String }
*
*/
public void setName(String value) {
this.name = value;
}
/**
* Gets the value of the delay property.
*
*/
public int getDelay() {
return delay;
}
/**
* Gets the value of the delay property.
*
*/
public int getDelay() {
return delay;
}
/**
* Sets the value of the delay property.
*
*/
public void setDelay(int value) {
this.delay = value;
}
/**
* Sets the value of the delay property.
*
*/
public void setDelay(int value) {
this.delay = value;
}
/**
* Gets the value of the cooldown property.
*
*/
public int getCooldown() {
return cooldown;
}
/**
* Gets the value of the cooldown property.
*
*/
public int getCooldown() {
return cooldown;
}
/**
* Sets the value of the cooldown property.
*
*/
public void setCooldown(int value) {
this.cooldown = value;
}
/**
* Sets the value of the cooldown property.
*
*/
public void setCooldown(int value) {
this.cooldown = value;
}
}

553
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
View File

@@ -5,11 +5,11 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -17,14 +17,17 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
/**
* <p>Java class for anonymous complex type.
* <p>
* Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType>
@@ -72,308 +75,290 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"teleport"
})
@XmlType(name = "", propOrder = { "teleport" })
@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
public class Teleports {
@XmlElement(required = true)
protected List<Teleports.Teleport> teleport;
@XmlElement(required = true)
protected List<Teleports.Teleport> teleport;
/**
* Gets the value of the teleport property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the teleport property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getTeleport().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link Teleports.Teleport }
*
*
*/
public List<Teleports.Teleport> getTeleport() {
if (teleport == null) {
teleport = new ArrayList<Teleports.Teleport>();
}
return this.teleport;
}
/**
* Gets the value of the teleport property.
*
* <p>
* This accessor method returns a reference to the live list, not a
* snapshot. Therefore any modification you make to the returned list will
* be present inside the JAXB object. This is why there is not a
* <CODE>set</CODE> method for the teleport property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getTeleport().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link Teleports.Teleport }
*
*
*/
public List<Teleports.Teleport> getTeleport() {
if (teleport == null) {
teleport = new ArrayList<Teleports.Teleport>();
}
return this.teleport;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;extension base="{}AbstractTemplate">
* &lt;sequence>
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;element name="restrictions" minOccurs="0">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/extension>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "point", "restrictions" })
public static class Teleport extends AbstractTemplate {
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;extension base="{}AbstractTemplate">
* &lt;sequence>
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;element name="restrictions" minOccurs="0">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/extension>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"point",
"restrictions"
})
public static class Teleport
extends AbstractTemplate
{
protected Coordinate point;
protected Teleports.Teleport.Restrictions restrictions;
@XmlAttribute(name = "id", required = true)
@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
protected TeleportationTemplateID id;
@XmlAttribute(name = "name")
protected String name;
@XmlAttribute(name = "item")
protected Integer item;
@XmlAttribute(name = "price", required = true)
protected int price;
protected Coordinate point;
protected Teleports.Teleport.Restrictions restrictions;
@XmlAttribute(name = "id", required = true)
@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
protected TeleportationTemplateID id;
@XmlAttribute(name = "name")
protected String name;
@XmlAttribute(name = "item")
protected Integer item;
@XmlAttribute(name = "price", required = true)
protected int price;
/**
* Gets the value of the point property.
*
* @return possible object is {@link Coordinate }
*
*/
public Coordinate getPoint() {
return point;
}
/**
* Gets the value of the point property.
*
* @return
* possible object is
* {@link Coordinate }
*
*/
public Coordinate getPoint() {
return point;
}
/**
* Sets the value of the point property.
*
* @param value
* allowed object is {@link Coordinate }
*
*/
public void setPoint(Coordinate value) {
this.point = value;
}
/**
* Sets the value of the point property.
*
* @param value
* allowed object is
* {@link Coordinate }
*
*/
public void setPoint(Coordinate value) {
this.point = value;
}
/**
* Gets the value of the restrictions property.
*
* @return possible object is {@link Teleports.Teleport.Restrictions }
*
*/
public Teleports.Teleport.Restrictions getRestrictions() {
return restrictions;
}
/**
* Gets the value of the restrictions property.
*
* @return
* possible object is
* {@link Teleports.Teleport.Restrictions }
*
*/
public Teleports.Teleport.Restrictions getRestrictions() {
return restrictions;
}
/**
* Sets the value of the restrictions property.
*
* @param value
* allowed object is {@link Teleports.Teleport.Restrictions }
*
*/
public void setRestrictions(Teleports.Teleport.Restrictions value) {
this.restrictions = value;
}
/**
* Sets the value of the restrictions property.
*
* @param value
* allowed object is
* {@link Teleports.Teleport.Restrictions }
*
*/
public void setRestrictions(Teleports.Teleport.Restrictions value) {
this.restrictions = value;
}
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
*
*/
public TeleportationTemplateID getID() {
return id;
}
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
*
*/
public TeleportationTemplateID getID() {
return id;
}
/**
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
*
*/
public void setID(TeleportationTemplateID value) {
this.id = value;
}
/**
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setID(TeleportationTemplateID value) {
this.id = value;
}
/**
* Gets the value of the name property.
*
* @return possible object is {@link String }
*
*/
public String getName() {
return name;
}
/**
* Gets the value of the name property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getName() {
return name;
}
/**
* Sets the value of the name property.
*
* @param value
* allowed object is {@link String }
*
*/
public void setName(String value) {
this.name = value;
}
/**
* Sets the value of the name property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setName(String value) {
this.name = value;
}
/**
* Gets the value of the item property.
*
* @return possible object is {@link Integer }
*
*/
public Integer getItem() {
return item;
}
/**
* Gets the value of the item property.
*
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getItem() {
return item;
}
/**
* Sets the value of the item property.
*
* @param value
* allowed object is {@link Integer }
*
*/
public void setItem(Integer value) {
this.item = value;
}
/**
* Sets the value of the item property.
*
* @param value
* allowed object is
* {@link Integer }
*
*/
public void setItem(Integer value) {
this.item = value;
}
/**
* Gets the value of the price property.
*
*/
public int getPrice() {
return price;
}
/**
* Gets the value of the price property.
*
*/
public int getPrice() {
return price;
}
/**
* Sets the value of the price property.
*
*/
public void setPrice(int value) {
this.price = value;
}
/**
* Sets the value of the price property.
*
*/
public void setPrice(int value) {
this.price = value;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "restriction" })
public static class Restrictions {
@XmlElement(required = true)
protected List<String> restriction;
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"restriction"
})
public static class Restrictions {
/**
* Gets the value of the restriction property.
*
* <p>
* This accessor method returns a reference to the live list, not a
* snapshot. Therefore any modification you make to the returned
* list will be present inside the JAXB object. This is why there is
* not a <CODE>set</CODE> method for the restriction property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getRestriction().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link String }
*
*
*/
public List<String> getRestriction() {
if (restriction == null) {
restriction = new ArrayList<String>();
}
return this.restriction;
}
@XmlElement(required = true)
protected List<String> restriction;
}
/**
* Gets the value of the restriction property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the restriction property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getRestriction().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link String }
*
*
*/
public List<String> getRestriction() {
if (restriction == null) {
restriction = new ArrayList<String>();
}
return this.restriction;
}
}
}
}
}

236
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
View File

@@ -5,22 +5,24 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import java.util.ArrayList;
import java.util.List;
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;
/**
* <p>Java class for ZoneType complex type.
* <p>
* Java class for ZoneType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType name="ZoneType">
@@ -49,131 +51,129 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ZoneType", namespace = "zones", propOrder = {
"point"
})
@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point" })
public class ZoneType {
@XmlElement(required = true)
protected List<ZoneType.Point> point;
@XmlAttribute(name = "id", required = true)
protected String id;
@XmlElement(required = true)
protected List<ZoneType.Point> point;
@XmlAttribute(name = "id", required = true)
protected String id;
/**
* Gets the value of the point property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the point property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getPoint().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link ZoneType.Point }
*
*
*/
public List<ZoneType.Point> getPoint() {
if (point == null) {
point = new ArrayList<ZoneType.Point>();
}
return this.point;
}
/**
* Gets the value of the point property.
*
* <p>
* This accessor method returns a reference to the live list, not a
* snapshot. Therefore any modification you make to the returned list will
* be present inside the JAXB object. This is why there is not a
* <CODE>set</CODE> method for the point property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getPoint().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link ZoneType.Point }
*
*
*/
public List<ZoneType.Point> getPoint() {
if (point == null) {
point = new ArrayList<ZoneType.Point>();
}
return this.point;
}
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getId() {
return id;
}
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
*
*/
public String getId() {
return id;
}
/**
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setId(String value) {
this.id = value;
}
/**
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
*
*/
public void setId(String value) {
this.id = value;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;/sequence>
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public static class Point {
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;/sequence>
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public static class Point {
@XmlAttribute(name = "x", required = true)
protected int x;
@XmlAttribute(name = "y", required = true)
protected int y;
@XmlAttribute(name = "x", required = true)
protected int x;
@XmlAttribute(name = "y", required = true)
protected int y;
/**
* Gets the value of the x property.
*
*/
public int getX() {
return x;
}
/**
* Gets the value of the x property.
*
*/
public int getX() {
return x;
}
/**
* Sets the value of the x property.
*
*/
public void setX(int value) {
this.x = value;
}
/**
* Sets the value of the x property.
*
*/
public void setX(int value) {
this.x = value;
}
/**
* Gets the value of the y property.
*
*/
public int getY() {
return y;
}
/**
* Gets the value of the y property.
*
*/
public int getY() {
return y;
}
/**
* Sets the value of the y property.
*
*/
public void setY(int value) {
this.y = value;
}
/**
* Sets the value of the y property.
*
*/
public void setY(int value) {
this.y = value;
}
}
}
}

272
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
View File

@@ -5,7 +5,6 @@
// Generated on: 2012.03.25 at 01:03:28 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,13 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for anonymous complex type.
* <p>
* Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
*
* <pre>
* &lt;complexType>
@@ -55,157 +56,146 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"castle"
})
@XmlType(name = "", propOrder = { "castle" })
@XmlRootElement(name = "zones", namespace = "zones")
public class Zones {
@XmlElement(required = true)
protected Zones.Castle castle;
@XmlElement(required = true)
protected Zones.Castle castle;
/**
* Gets the value of the castle property.
*
* @return
* possible object is
* {@link Zones.Castle }
*
*/
public Zones.Castle getCastle() {
return castle;
}
/**
* Gets the value of the castle property.
*
* @return possible object is {@link Zones.Castle }
*
*/
public Zones.Castle getCastle() {
return castle;
}
/**
* Sets the value of the castle property.
*
* @param value
* allowed object is
* {@link Zones.Castle }
*
*/
public void setCastle(Zones.Castle value) {
this.castle = value;
}
/**
* Sets the value of the castle property.
*
* @param value
* allowed object is {@link Zones.Castle }
*
*/
public void setCastle(Zones.Castle value) {
this.castle = value;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="siege">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "siege" })
public static class Castle {
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="siege">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"siege"
})
public static class Castle {
@XmlElement(required = true)
protected Zones.Castle.Siege siege;
@XmlElement(required = true)
protected Zones.Castle.Siege siege;
/**
* Gets the value of the siege property.
*
* @return possible object is {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege getSiege() {
return siege;
}
/**
* Gets the value of the siege property.
*
* @return
* possible object is
* {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege getSiege() {
return siege;
}
/**
* Sets the value of the siege property.
*
* @param value
* allowed object is {@link Zones.Castle.Siege }
*
*/
public void setSiege(Zones.Castle.Siege value) {
this.siege = value;
}
/**
* Sets the value of the siege property.
*
* @param value
* allowed object is
* {@link Zones.Castle.Siege }
*
*/
public void setSiege(Zones.Castle.Siege value) {
this.siege = value;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "zone" })
public static class Siege {
@XmlElement(required = true)
protected ZoneType zone;
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"zone"
})
public static class Siege {
/**
* Gets the value of the zone property.
*
* @return possible object is {@link ZoneType }
*
*/
public ZoneType getZone() {
return zone;
}
@XmlElement(required = true)
protected ZoneType zone;
/**
* Sets the value of the zone property.
*
* @param value
* allowed object is {@link ZoneType }
*
*/
public void setZone(ZoneType value) {
this.zone = value;
}
/**
* Gets the value of the zone property.
*
* @return
* possible object is
* {@link ZoneType }
*
*/
public ZoneType getZone() {
return zone;
}
}
/**
* Sets the value of the zone property.
*
* @param value
* allowed object is
* {@link ZoneType }
*
*/
public void setZone(ZoneType value) {
this.zone = value;
}
}
}
}
}

1
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver;
import com.l2jserver.service.network.model.ProtocolVersion;
/**
* Constant values for this L2J compilation
*

6
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java
View File

@@ -42,10 +42,12 @@ public class CharacterShortcutID extends
*
* @param id
* the id
* @param shortcutDao the shortcut DAO
* @param shortcutDao
* the shortcut DAO
*/
@Inject
public CharacterShortcutID(@Assisted int id, CharacterShortcutDAO shortcutDao) {
public CharacterShortcutID(@Assisted int id,
CharacterShortcutDAO shortcutDao) {
super(id);
this.shortcutDao = shortcutDao;
}

1
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jserver.model.template;
/**
* Template for an Aumentation
*

21
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java
View File

@@ -95,10 +95,11 @@ public abstract class Actor extends PositionableObject {
DEAD;
}
// /**
// * The currently effects active on the actor
// */
// protected final ActorEffectContainer effects = new ActorEffectContainer(this);
// /**
// * The currently effects active on the actor
// */
// protected final ActorEffectContainer effects = new
// ActorEffectContainer(this);
/**
* The skills learned by this actor
*/
@@ -270,12 +271,12 @@ public abstract class Actor extends PositionableObject {
return state == ActorState.ATTACKING;
}
// /**
// * @return the active effects on this actor
// */
// public ActorEffectContainer getEffects() {
// return effects;
// }
// /**
// * @return the active effects on this actor
// */
// public ActorEffectContainer getEffects() {
// return effects;
// }
/**
* @return the actor skills

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java
View File

@@ -52,6 +52,5 @@ public abstract class ActorCalculatorFunction extends
* the original value
* @return the calculated value
*/
protected abstract double calculate(Actor a, ActorTemplate t,
double value);
protected abstract double calculate(Actor a, ActorTemplate t, double value);
}

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java
View File

@@ -43,10 +43,10 @@ public class MaximumHPAddCalculator extends CharacterFormula {
@Override
public double calculate(L2Character c, CharacterTemplate t, double value) {
int lvl = c.getLevel() - t.getStats().getLevel();
int lvl = c.getLevel() - t.getStats().getLevel();
double mod = t.getStats().getHp().getModifier() * lvl;
double max = (t.getStats().getHp().getAdd() + mod) * lvl;
double min = ( t.getStats().getHp().getAdd() * lvl) + mod;
double min = (t.getStats().getHp().getAdd() * lvl) + mod;
return value + (max + min) / 2;
}

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java
View File

@@ -43,6 +43,6 @@ public class CharacterBasePhysicalCriticalRateCalculator extends
@Override
protected double calculate(L2Character c, CharacterTemplate t, double value) {
return t.getStats().getAttack().getCritical();
return t.getStats().getAttack().getCritical();
}
}

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java
View File

@@ -50,7 +50,8 @@ public class ItemPickEvent implements ItemEvent, CharacterEvent {
* the picking up character
* @param item
* the picked up item
* @param newItem the new {@link Item}
* @param newItem
* the new {@link Item}
*/
public ItemPickEvent(L2Character character, Item item, Item newItem) {
this.character = character;

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
View File

@@ -152,7 +152,7 @@ public abstract class BaseNPCController implements NPCController {
break;
}
}
if(html == null)
if (html == null)
return null;
// TODO use an decent template engine

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java
View File

@@ -33,8 +33,8 @@ import com.l2jserver.util.html.markup.MarkupTag;
*/
public class NotImplementedNPCController extends BaseNPCController {
@Override
public void interact(NPC npc, L2Character character,
final String... args) throws L2Exception {
public void interact(NPC npc, L2Character character, final String... args)
throws L2Exception {
// action not handled
final HtmlTemplate template = new HtmlTemplate() {
@Override

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java
View File

@@ -42,8 +42,7 @@ import com.l2jserver.service.database.dao.sql.SQLNPCDAO;
public class JDBCDAOModule extends AbstractModule {
@Override
protected void configure() {
bind(CharacterDAO.class).to(SQLCharacterDAO.class)
.in(Scopes.SINGLETON);
bind(CharacterDAO.class).to(SQLCharacterDAO.class).in(Scopes.SINGLETON);
bind(CharacterFriendDAO.class).to(SQLCharacterFriendDAO.class).in(
Scopes.SINGLETON);
bind(CharacterShortcutDAO.class).to(SQLCharacterShortcutDAO.class).in(

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java
View File

@@ -140,7 +140,8 @@ public class OrientDBItemDAO extends AbstractOrientDBDAO<Item, ItemID>
@Override
protected OQueryContextNative query(
OQueryContextNative record, Item o) {
return record.field(name(entity.itemId)).eq(o.getID().getID());
return record.field(name(entity.itemId)).eq(
o.getID().getID());
}
});
}

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java
View File

@@ -126,8 +126,8 @@ public class SQLCharacterFriendDAO extends
protected void query(SQLDeleteClause q, CharacterFriend o) {
q.where(entity.characterId.eq(
o.getID().getCharacterID().getID()).and(
entity.characterIdFriend.eq(o.getID().getFriendID()
.getID())));
entity.characterIdFriend.eq(o.getID()
.getFriendID().getID())));
}
});
}

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java
View File

@@ -48,7 +48,9 @@ public class QCharacterFriend extends
/**
* Creates a new instance
* @param variable the query variable
*
* @param variable
* the query variable
*/
public QCharacterFriend(String variable) {
super(FriendID.class, forVariable(variable), "null", "character_friend");

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java
View File

@@ -88,7 +88,9 @@ public class QCharacterShortcut extends
/**
* Creates a new instance
* @param variable the query variable
*
* @param variable
* the query variable
*/
public QCharacterShortcut(String variable) {
super(Integer.class, forVariable(variable), "null",

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java
View File

@@ -44,7 +44,9 @@ public class QClan extends com.mysema.query.sql.RelationalPathBase<Integer> {
/**
* Creates a new instance
* @param variable the query variable
*
* @param variable
* the query variable
*/
public QClan(String variable) {
super(Integer.class, forVariable(variable), "null", "clan");

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java
View File

@@ -97,7 +97,9 @@ public class QItem extends com.mysema.query.sql.RelationalPathBase<Integer> {
/**
* Creates a new instance
* @param variable the query variable
*
* @param variable
* the query variable
*/
public QItem(String variable) {
super(Integer.class, forVariable(variable), "null", "item");

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java
View File

@@ -78,7 +78,9 @@ public class QLogChat extends com.mysema.query.sql.RelationalPathBase<Integer> {
/**
* Creates a new instance
* @param variable the query variable
*
* @param variable
* the query variable
*/
public QLogChat(String variable) {
super(Integer.class, forVariable(variable), "null", "log_chat");

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java
View File

@@ -84,7 +84,9 @@ public class QNPC extends com.mysema.query.sql.RelationalPathBase<Integer> {
/**
* Creates a new instance
* @param variable the query variable
*
* @param variable
* the query variable
*/
public QNPC(String variable) {
super(Integer.class, forVariable(variable), "null", "npc");

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java
View File

@@ -64,8 +64,8 @@ public class AttackServiceImpl extends AbstractService implements AttackService
private final NPCService npcService;
/**
* The {@link WorldEventDispatcherService} is used to dispatch attack events to the
* world
* The {@link WorldEventDispatcherService} is used to dispatch attack events
* to the world
*/
private final WorldEventDispatcherService eventDispatcher;

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java
View File

@@ -79,8 +79,8 @@ public class AIServiceImpl extends AbstractService implements AIService {
*/
@Inject
public AIServiceImpl(WorldService worldService,
WorldEventDispatcherService eventDispatcher, ThreadService threadService,
NetworkService networkService) {
WorldEventDispatcherService eventDispatcher,
ThreadService threadService, NetworkService networkService) {
this.worldService = worldService;
this.eventDispatcher = eventDispatcher;
this.threadService = threadService;

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java
View File

@@ -22,8 +22,7 @@ package com.l2jserver.service.game.character;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class TooManyCharactersException extends
CharacterServiceException {
public class TooManyCharactersException extends CharacterServiceException {
/**
* The Java Serialization API serial
*/

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java
View File

@@ -52,8 +52,8 @@ import com.l2jserver.service.Service;
* {@link ChatBanActiveChatServiceException} will be thrown.
*
* <h1>Packets</h1>
* Messages are received (from the clients) with <code>CM_CHAR_CHAT</code> and sent (to
* the clients) with <code>SM_ACTOR_CHAT</code>.
* Messages are received (from the clients) with <code>CM_CHAR_CHAT</code> and
* sent (to the clients) with <code>SM_ACTOR_CHAT</code>.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/

22
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java
View File

@@ -55,10 +55,10 @@ public class SimpleChatService extends AbstractService implements ChatService {
* The {@link ChatLoggingService} implementation
*/
private final ChatLoggingService chatLoggingService;
// /**
// * The {@link RegionService}
// */
// private final RegionService regionService;
// /**
// * The {@link RegionService}
// */
// private final RegionService regionService;
/**
* The {@link L2Character} DAO
*/
@@ -177,13 +177,13 @@ public class SimpleChatService extends AbstractService implements ChatService {
@Override
public PublicChatChannel getRegionChannel(L2Character character) {
Preconditions.checkNotNull(character, "character");
// final Region region = regionService.getRegion(character);
// RegionChatChannelImpl channel = regionChannels.get(region);
// if (channel == null) {
// channel = new RegionChatChannelImpl(region);
// regionChannels.put(region, channel);
// }
// return channel;
// final Region region = regionService.getRegion(character);
// RegionChatChannelImpl channel = regionChannels.get(region);
// if (channel == null) {
// channel = new RegionChatChannelImpl(region);
// regionChannels.put(region, channel);
// }
// return channel;
return null;
}

12
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java
View File

@@ -149,7 +149,8 @@ public class ItemServiceImpl extends
@Override
public Item split(Item item, long count)
throws NotEnoughItemsServiceException, NonStackableItemsServiceException {
throws NotEnoughItemsServiceException,
NonStackableItemsServiceException {
if (item.getCount() < count)
throw new NotEnoughItemsServiceException();
if (item.getCount() == count)
@@ -187,7 +188,8 @@ public class ItemServiceImpl extends
@Override
public boolean destroy(Item item, long count)
throws NotEnoughItemsServiceException, NonStackableItemsServiceException {
throws NotEnoughItemsServiceException,
NonStackableItemsServiceException {
synchronized (item) {
Item destroyItem = split(item, count);
itemDao.deleteObjectsAsync(destroyItem);
@@ -266,7 +268,8 @@ public class ItemServiceImpl extends
public Item drop(Item item, long count, Point3D point, Actor actor)
throws SpawnPointNotFoundServiceException,
ItemAlreadyOnGroundServiceException,
AlreadySpawnedServiceException, NotEnoughItemsServiceException, NonStackableItemsServiceException {
AlreadySpawnedServiceException, NotEnoughItemsServiceException,
NonStackableItemsServiceException {
synchronized (item) {
if (item.getLocation() == ItemLocation.GROUND)
throw new AlreadySpawnedServiceException();
@@ -320,7 +323,8 @@ public class ItemServiceImpl extends
public void drop(Item item, Point3D point, Actor actor)
throws SpawnPointNotFoundServiceException,
ItemAlreadyOnGroundServiceException,
AlreadySpawnedServiceException, NotEnoughItemsServiceException, NonStackableItemsServiceException {
AlreadySpawnedServiceException, NotEnoughItemsServiceException,
NonStackableItemsServiceException {
drop(item, item.getCount(), point, actor);
}

5
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java
View File

@@ -90,7 +90,8 @@ public class MapperPathingService extends AbstractService implements
*
* @param eventDispatcher
* the world event dispatcher
* @param vfsService the VFS service implementation
* @param vfsService
* the VFS service implementation
*/
@Inject
public MapperPathingService(WorldEventDispatcherService eventDispatcher,
@@ -117,7 +118,7 @@ public class MapperPathingService extends AbstractService implements
.fromCoordinate(point.getCoordinate());
try {
channel.write(struct.getByteBuffer());
//channel.force(true);
// channel.force(true);
} catch (IOException e1) {
log.warn("Error writing pathing file!", e1);
}

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java
View File

@@ -108,7 +108,8 @@ public class EclipseCompilerClassFileManager extends
* @return classLoader of this ClassFileManager
*/
@Override
public synchronized EclipseCompilerScriptClassLoader getClassLoader(Location location) {
public synchronized EclipseCompilerScriptClassLoader getClassLoader(
Location location) {
if (loader == null) {
loader = AccessController
.doPrivileged(new PrivilegedAction<EclipseCompilerScriptClassLoader>() {

9
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java
View File

@@ -80,7 +80,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
* @param classFileManager
* classFileManager of this classLoader
*/
EclipseCompilerScriptClassLoader(EclipseCompilerClassFileManager classFileManager) {
EclipseCompilerScriptClassLoader(
EclipseCompilerClassFileManager classFileManager) {
super(new URL[] {});
this.classFileManager = classFileManager;
}
@@ -94,7 +95,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
* @param parent
* parent classLoader
*/
EclipseCompilerScriptClassLoader(EclipseCompilerClassFileManager classFileManager, ClassLoader parent) {
EclipseCompilerScriptClassLoader(
EclipseCompilerClassFileManager classFileManager, ClassLoader parent) {
super(new URL[] {}, parent);
this.classFileManager = classFileManager;
}
@@ -176,7 +178,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
newName = newName.replace('/', '.');
if (classFileManager.getCompiledClasses().containsKey(newName)) {
try {
return new URL(null,
return new URL(
null,
EclipseCompilerVirtualClassURLStreamHandler.HANDLER_PROTOCOL
+ newName, urlStreamHandler);
} catch (MalformedURLException e) {

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java
View File

@@ -48,7 +48,8 @@ public class EclipseCompilerVirtualClassURLConnection extends URLConnection {
* @param cl
* classloader
*/
protected EclipseCompilerVirtualClassURLConnection(URL url, EclipseCompilerScriptClassLoader cl) {
protected EclipseCompilerVirtualClassURLConnection(URL url,
EclipseCompilerScriptClassLoader cl) {
super(url);
BinaryClass bc = cl.getClassFileManager().getCompiledClasses()
.get(url.getHost());

6
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java
View File

@@ -27,7 +27,8 @@ import java.net.URLStreamHandler;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class EclipseCompilerVirtualClassURLStreamHandler extends URLStreamHandler {
public class EclipseCompilerVirtualClassURLStreamHandler extends
URLStreamHandler {
/**
* Script Handler protocol for classes compiled from source
@@ -45,7 +46,8 @@ public class EclipseCompilerVirtualClassURLStreamHandler extends URLStreamHandle
* @param cl
* ScriptClassLoaderImpl that was used to load compiled class
*/
public EclipseCompilerVirtualClassURLStreamHandler(EclipseCompilerScriptClassLoader cl) {
public EclipseCompilerVirtualClassURLStreamHandler(
EclipseCompilerScriptClassLoader cl) {
this.cl = cl;
}

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java
View File

@@ -190,7 +190,8 @@ public class EclipseScriptCompiler implements ScriptCompiler {
Iterable<JavaFileObject> compilationUnits) {
List<String> options = Arrays.asList("-encoding", "UTF-8", "-g");
DiagnosticListener<JavaFileObject> listener = new ErrorListener();
EclipseCompilerClassFileManager manager = new EclipseCompilerClassFileManager(javaCompiler, listener);
EclipseCompilerClassFileManager manager = new EclipseCompilerClassFileManager(
javaCompiler, listener);
manager.setParentClassLoader(parentClassLoader);
if (libraries != null) {

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java
View File

@@ -94,7 +94,8 @@ public class JDKScriptClassLoader extends ScriptClassLoader {
* @param parent
* parent classLoader
*/
JDKScriptClassLoader(JDKClassFileManager classFileManager, ClassLoader parent) {
JDKScriptClassLoader(JDKClassFileManager classFileManager,
ClassLoader parent) {
super(new URL[] {}, parent);
this.classFileManager = classFileManager;
}

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java
View File

@@ -189,7 +189,8 @@ public class JDKScriptCompiler implements ScriptCompiler {
Iterable<JavaFileObject> compilationUnits) {
List<String> options = Arrays.asList("-encoding", "UTF-8", "-g");
DiagnosticListener<JavaFileObject> listener = new ErrorListener();
JDKClassFileManager manager = new JDKClassFileManager(javaCompiler, listener);
JDKClassFileManager manager = new JDKClassFileManager(javaCompiler,
listener);
manager.setParentClassLoader(parentClassLoader);
if (libraries != null) {

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java
View File

@@ -79,7 +79,8 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
*/
@Inject
public SpawnServiceImpl(WorldService worldService,
WorldEventDispatcherService eventDispatcher, ThreadService threadService) {
WorldEventDispatcherService eventDispatcher,
ThreadService threadService) {
this.worldService = worldService;
this.eventDispatcher = eventDispatcher;
this.threadService = threadService;

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
View File

@@ -56,7 +56,7 @@ public class RangeFilter implements WorldObjectFilter<PositionableObject> {
public boolean accept(PositionableObject other) {
if (other == null)
return false;
if(other.getPoint() == null)
if (other.getPoint() == null)
return false;
final double dx = FastMath.abs(object.getPoint().getX()

1
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jserver.service.network;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.Service;

20
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java
View File

@@ -48,7 +48,7 @@ public interface Lineage2Client {
/**
* @return the character
*/
L2Character getCharacter() ;
L2Character getCharacter();
/**
* @param characterID
@@ -157,14 +157,13 @@ public interface Lineage2Client {
* the {@link SystemMessage}
* @param args
* the arguments of the message, they will be automatically
* detected and inserted. See <code>SM_SYSTEM_MESSAGE</code> for more
* about supported formats.
* detected and inserted. See <code>SM_SYSTEM_MESSAGE</code> for
* more about supported formats.
* @return the {@link ChannelFuture} that will be notified once the packet
* has been written.
* @see SystemMessage
*/
ChannelFuture sendSystemMessage(SystemMessage message,
Object... args);
ChannelFuture sendSystemMessage(SystemMessage message, Object... args);
/**
* Sends a <code>SM_ACTION_FAILED</code> to the client.
@@ -178,9 +177,9 @@ public interface Lineage2Client {
ChannelFuture sendActionFailed();
/**
* Sends a <code>SM_HTML</code> packet to the client. In the packet, the NPC will
* be null. If you wish to send the HTML with an NPC, you should send the
* packet directly.
* Sends a <code>SM_HTML</code> packet to the client. In the packet, the NPC
* will be null. If you wish to send the HTML with an NPC, you should send
* the packet directly.
* <p>
* This is an convenience method for <blockquote><code>
* conn.write(new SM_HTML(null, template));</code></blockquote>
@@ -193,8 +192,9 @@ public interface Lineage2Client {
ChannelFuture sendHTML(HtmlTemplate template);
/**
* Sends a <code>SM_COMMUNITY_HTML</code> packet to the client. HTML code is not
* displayed in the regular chat window, they will appear in a large one.
* Sends a <code>SM_COMMUNITY_HTML</code> packet to the client. HTML code is
* not displayed in the regular chat window, they will appear in a large
* one.
* <p>
* This is an convenience method for <blockquote><code>
* conn.write(new SM_COMMUNITY_HTML(template));</code></blockquote>

1
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jserver.service.network.model;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
*

1
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver.util.geometry;
import org.apache.commons.math.geometry.Vector3D;
/**
* Represents an coordinate in the game world.
* <p>

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java
View File

@@ -53,6 +53,7 @@ public class ScriptingServiceImplTest {
/**
* Tests script loading
*
* @throws Exception
*/
@Test
@@ -64,6 +65,7 @@ public class ScriptingServiceImplTest {
/**
* Tests script instantiation
*
* @throws Exception
*/
@Test

3
l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java
View File

@@ -69,6 +69,7 @@ public class WorldEventDispatcherImplTest {
/**
* Prepares the tests
*
* @throws ServiceStartException
*/
@Before
@@ -90,6 +91,7 @@ public class WorldEventDispatcherImplTest {
/**
* Test listenteners - mode 1
*
* @throws InterruptedException
*/
@Test
@@ -135,6 +137,7 @@ public class WorldEventDispatcherImplTest {
/**
* Test listeners - mode 2
*
* @throws InterruptedException
*/
@Test

1
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java
View File

@@ -409,6 +409,7 @@ public class FreyaLineage2Client implements Lineage2Client {
return (Lineage2PacketWriter) channel.getPipeline().get(
Lineage2PacketWriter.HANDLER_NAME);
}
@Override
public String toString() {
return "Lineage2Client [channel=" + channel + ", characterID="

9
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java
View File

@@ -77,9 +77,12 @@ public class CM_CHAR_ACTION extends AbstractClientPacket {
private CharacterAction action;
/**
* @param idResolver the id resolver
* @param npcService the npc service
* @param itemService the item service
* @param idResolver
* the id resolver
* @param npcService
* the npc service
* @param itemService
* the item service
*/
@Inject
public CM_CHAR_ACTION(ObjectIDResolver idResolver, NPCService npcService,

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java
View File

@@ -42,7 +42,8 @@ public class CM_CHAR_APPEARING extends AbstractClientPacket {
private final SpawnService spawnService;
/**
* @param spawnService the spawn service
* @param spawnService
* the spawn service
*/
@Inject
public CM_CHAR_APPEARING(SpawnService spawnService) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java
View File

@@ -127,7 +127,8 @@ public class CM_CHAR_ATTACK extends AbstractClientPacket {
* the object id resolver
*/
@Inject
public CM_CHAR_ATTACK(CharacterService charService, ObjectIDResolver idResolver) {
public CM_CHAR_ATTACK(CharacterService charService,
ObjectIDResolver idResolver) {
this.charService = charService;
this.idResolver = idResolver;
}

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java
View File

@@ -63,7 +63,8 @@ public class CM_CHAR_CHAT extends AbstractClientPacket {
private String target;
/**
* @param chatService the chat service
* @param chatService
* the chat service
*/
@Inject
public CM_CHAR_CHAT(ChatService chatService) {

10
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java
View File

@@ -66,6 +66,7 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
/**
* Defines the movement action type
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum MovementType {
@@ -84,14 +85,16 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
public final int id;
/**
* @param id the type id
* @param id
* the type id
*/
MovementType(int id) {
this.id = id;
}
/**
* @param id the type id
* @param id
* the type id
* @return the {@link MovementType} represented by <code>id</code>
*/
public static MovementType fromID(int id) {
@@ -104,7 +107,8 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
}
/**
* @param charService the character service
* @param charService
* the character service
*/
@Inject
public CM_CHAR_MOVE(CharacterService charService) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java
View File

@@ -51,7 +51,8 @@ public class CM_CHAR_POSITION extends AbstractClientPacket {
private int extra; // vehicle id
/**
* @param charService the character service
* @param charService
* the character service
*/
@Inject
public CM_CHAR_POSITION(CharacterService charService) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java
View File

@@ -51,7 +51,8 @@ public class CM_CHAR_SELECT extends AbstractClientPacket {
private int slot;
/**
* @param characterDao the character dao
* @param characterDao
* the character dao
*/
@Inject
public CM_CHAR_SELECT(CharacterDAO characterDao) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
View File

@@ -51,7 +51,8 @@ public class CM_ENTER_WORLD extends AbstractClientPacket {
private final CharacterService characterService;
/**
* @param characterService the character service
* @param characterService
* the character service
*/
@Inject
public CM_ENTER_WORLD(CharacterService characterService) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java
View File

@@ -53,7 +53,8 @@ public class CM_GG_KEY extends AbstractClientPacket {
private byte[] key = new byte[8];
/**
* @param ggService the gameguard service
* @param ggService
* the gameguard service
*/
@Inject
public CM_GG_KEY(GameGuardService ggService) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
View File

@@ -49,7 +49,8 @@ public class CM_GOTO_LOBBY extends AbstractClientPacket {
private final CharacterDAO characterDao;
/**
* @param characterDao the character dao
* @param characterDao
* the character dao
*/
@Inject
public CM_GOTO_LOBBY(CharacterDAO characterDao) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java
View File

@@ -97,7 +97,8 @@ public class CM_ITEM_DESTROY extends AbstractClientPacket {
} else {
conn.updateInventoryItems(item);
}
} catch (NotEnoughItemsServiceException | NonStackableItemsServiceException e) {
} catch (NotEnoughItemsServiceException
| NonStackableItemsServiceException e) {
conn.sendSystemMessage(SystemMessage.CANNOT_DISCARD_THIS_ITEM);
}
}

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java
View File

@@ -119,7 +119,8 @@ public class CM_ITEM_DROP extends AbstractClientPacket {
} catch (ItemAlreadyOnGroundServiceException
| AlreadySpawnedServiceException
| SpawnPointNotFoundServiceException
| NotEnoughItemsServiceException | NonStackableItemsServiceException e) {
| NotEnoughItemsServiceException
| NonStackableItemsServiceException e) {
conn.sendActionFailed();
}
}

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
View File

@@ -66,7 +66,8 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
private ProtocolVersion version;
/**
* @param keygen the keygen service
* @param keygen
* the keygen service
*/
@Inject
public CM_PROTOCOL_VERSION(BlowfishKeygenService keygen) {

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java
View File

@@ -65,7 +65,8 @@ public class CM_REQUEST_CHAR_TEMPLATE extends AbstractClientPacket {
private final CharacterTemplateIDProvider idFactory;
/**
* @param idFactory the character template id provider
* @param idFactory
* the character template id provider
*/
@Inject
public CM_REQUEST_CHAR_TEMPLATE(CharacterTemplateIDProvider idFactory) {

6
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java
View File

@@ -49,8 +49,10 @@ public class CM_RESTART extends AbstractClientPacket {
private final CharacterDAO charDao;
/**
* @param charService the character service
* @param charDao the character dao
* @param charService
* the character service
* @param charDao
* the character dao
*/
@Inject
public CM_RESTART(CharacterService charService, CharacterDAO charDao) {

21
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java
View File

@@ -55,11 +55,15 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
private int messageID = 0;
/**
* @param character the actor
* @param destination the destination
* @param message the message
* @param character
* the actor
* @param destination
* the destination
* @param message
* the message
*/
public SM_ACTOR_CHAT(Actor character, ChatMessageType destination, String message) {
public SM_ACTOR_CHAT(Actor character, ChatMessageType destination,
String message) {
super(OPCODE);
this.actor = character;
this.destination = destination;
@@ -67,9 +71,12 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
}
/**
* @param actor the actor
* @param destination the destination
* @param messageID the message id
* @param actor
* the actor
* @param destination
* the destination
* @param messageID
* the message id
*/
public SM_ACTOR_CHAT(Actor actor, ChatMessageType destination, int messageID) {
super(OPCODE);

6
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java
View File

@@ -46,8 +46,10 @@ public class SM_ACTOR_MOVE extends AbstractServerPacket {
private Coordinate target;
/**
* @param actor the actor
* @param target the target
* @param actor
* the actor
* @param target
* the target
*/
public SM_ACTOR_MOVE(Actor actor, Coordinate target) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java
View File

@@ -40,7 +40,8 @@ public class SM_ACTOR_POSITION extends AbstractServerPacket {
private final Actor actor;
/**
* @param actor the actor
* @param actor
* the actor
*/
public SM_ACTOR_POSITION(Actor actor) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java
View File

@@ -77,7 +77,8 @@ public class SM_CHAR_INFO extends AbstractServerPacket {
private L2Character character;
/**
* @param character the character
* @param character
* the character
*/
public SM_CHAR_INFO(L2Character character) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java
View File

@@ -39,7 +39,8 @@ public class SM_CHAR_INFO_EXTRA extends AbstractServerPacket {
private L2Character character;
/**
* @param character the character
* @param character
* the character
*/
public SM_CHAR_INFO_EXTRA(L2Character character) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java
View File

@@ -45,7 +45,8 @@ public class SM_CHAR_INVENTORY extends AbstractServerPacket {
private boolean showWindow = false;
/**
* @param inventory the inventory
* @param inventory
* the inventory
*/
public SM_CHAR_INVENTORY(CharacterInventory inventory) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java
View File

@@ -39,7 +39,8 @@ public class SM_CHAR_MOVE_TYPE extends AbstractServerPacket {
private final L2Character character;
/**
* @param character the character
* @param character
* the character
*/
public SM_CHAR_MOVE_TYPE(L2Character character) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java
View File

@@ -38,7 +38,8 @@ public class SM_CHAR_OPEN_MAP extends AbstractServerPacket {
private final int mapID;
/**
* @param mapID the map id
* @param mapID
* the map id
*/
public SM_CHAR_OPEN_MAP(int mapID) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java
View File

@@ -42,7 +42,8 @@ public class SM_CHAR_SELECTED extends AbstractServerPacket {
private final L2Character character;
/**
* @param character the character
* @param character
* the character
*/
public SM_CHAR_SELECTED(L2Character character) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java
View File

@@ -39,7 +39,8 @@ public class SM_CHAR_STOP extends AbstractServerPacket {
private L2Character character;
/**
* @param character the character
* @param character
* the character
*/
public SM_CHAR_STOP(L2Character character) {
super(OPCODE);

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java
View File

@@ -40,7 +40,8 @@ public class SM_CHAR_TARGET_UNSELECT extends AbstractServerPacket {
private final L2Character character;
/**
* @param character the character
* @param character
* the character
*/
public SM_CHAR_TARGET_UNSELECT(L2Character character) {
super(OPCODE);

6
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java
View File

@@ -45,8 +45,10 @@ public class SM_CHAR_TELEPORT extends AbstractServerPacket {
private final Point3D point;
/**
* @param character the character
* @param point the teleport point
* @param character
* the character
* @param point
* the teleport point
*/
public SM_CHAR_TELEPORT(L2Character character, Point3D point) {
super(OPCODE);

9
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java
View File

@@ -42,7 +42,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
private final String html;
/**
* @param html the html
* @param html
* the html
*/
public SM_COMMUNITY_HTML(String html) {
super(OPCODE);
@@ -50,7 +51,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
}
/**
* @param html the html
* @param html
* the html
*/
public SM_COMMUNITY_HTML(Html html) {
super(OPCODE);
@@ -58,7 +60,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
}
/**
* @param template the html template
* @param template
* the html template
*/
public SM_COMMUNITY_HTML(HtmlTemplate template) {
super(OPCODE);

6
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java
View File

@@ -38,7 +38,8 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
private final Item item;
/**
* @param item the item that is on the ground
* @param item
* the item that is on the ground
*/
public SM_ITEM_GROUND(Item item) {
super(OPCODE);
@@ -47,7 +48,8 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
@Override
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt((item.getOwnerID() != null ? item.getOwnerID().getID() : 0)); // char who dropped
buffer.writeInt((item.getOwnerID() != null ? item.getOwnerID().getID()
: 0)); // char who dropped
buffer.writeInt(item.getID().getID()); // item obj id
buffer.writeInt(item.getTemplateID().getID()); // item template id

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java
View File

@@ -39,7 +39,8 @@ public class SM_MANOR_LIST extends AbstractServerPacket {
private String[] manors;
/**
* @param manors the manors
* @param manors
* the manors
*/
public SM_MANOR_LIST(String... manors) {
super(OPCODE);

6
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java
View File

@@ -55,7 +55,8 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
buffer.writeInt(npc.getID().getID()); // obj id
buffer.writeInt(npc.getTemplateID().getID() + 1000000); // template id
BufferUtils.writeString(buffer, template.getInfo().getName().getValue()); // name
BufferUtils
.writeString(buffer, template.getInfo().getName().getValue()); // name
buffer.writeInt((template.getInfo().isAttackable() ? 0x01 : 0x00)); // attackable
buffer.writeInt(npc.getPoint().getX()); // x
buffer.writeInt(npc.getPoint().getY()); // y
@@ -65,7 +66,8 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
buffer.writeDouble(0x01); // attack spd mult
buffer.writeDouble(template.getInfo().getCollision().getRadius());
buffer.writeDouble(template.getInfo().getCollision().getHeigth());
buffer.writeInt((int) (template.getInfo().isAttackable() ? npc.getHP() : 0x00));
buffer.writeInt((int) (template.getInfo().isAttackable() ? npc.getHP()
: 0x00));
buffer.writeInt((int) (template.getInfo().isAttackable() ? template
.getInfo().getStats().getHp() : 0x00));
buffer.writeInt(0x01); // object type

67
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java
View File

@@ -1,67 +0,0 @@
/*
* This file is part of l2jserver2 <l2jserver2.com>.
*
* l2jserver2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* l2jserver2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with l2jserver2. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.service.network.gameguard;
import java.util.concurrent.Future;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.Service;
import com.l2jserver.service.network.model.Lineage2Client;
/**
* This service is responsible for querying and validating GameGuard packets
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public interface GameGuardService extends Service {
/**
* Queries the client GameGuard for an response
*
* @param character
* the lineage 2 character
* @return an future that will be used to obtain validation status
*/
Future<GameGuardResponse> query(L2Character character);
/**
* The Game guard key state
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum GameGuardResponse {
/**
* Key is valid
*/
VALID,
/**
* Key is not valid
*/
INVALID;
}
/**
* Sets the game guard key for the given connection. Future will be notified
* of the key state (valid or invalid).
*
* @param conn
* the connection
* @param key
* the key
* @return the validation state
*/
GameGuardResponse key(Lineage2Client conn, byte[] key);
}

35
l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java
View File

@@ -131,15 +131,15 @@ public class NPCTemplateConverter {
}
System.out.println("Generating template XML files...");
// c.generateSchema(new SchemaOutputResolver() {
// @Override
// public Result createOutput(String namespaceUri,
// String suggestedFileName) throws IOException {
// // System.out.println(new File(target, suggestedFileName));
// // return null;
// return new StreamResult(new File(target, suggestedFileName));
// }
// });
// c.generateSchema(new SchemaOutputResolver() {
// @Override
// public Result createOutput(String namespaceUri,
// String suggestedFileName) throws IOException {
// // System.out.println(new File(target, suggestedFileName));
// // return null;
// return new StreamResult(new File(target, suggestedFileName));
// }
// });
try {
final Marshaller m = c.createMarshaller();
@@ -225,7 +225,7 @@ public class NPCTemplateConverter {
template.getInfo().setName(factory.createNPCTemplateInfoName());
template.getInfo().getName().setValue(rs.getString("name"));
//template.getInfo().getName().setDisplay(rs.getBoolean("show_name"));
// template.getInfo().getName().setDisplay(rs.getBoolean("show_name"));
template.getInfo().getName().setSend(rs.getBoolean("serverSideName"));
template.getInfo().setTitle(factory.createNPCTemplateInfoTitle());
@@ -243,9 +243,9 @@ public class NPCTemplateConverter {
template.getInfo().setSex(
ActorSex.valueOf(rs.getString("sex").toUpperCase()));
// template.info.attackable = rs.getBoolean("attackable");
//template.getInfo().setTargetable(rs.getBoolean("targetable"));
// template.getInfo().setTargetable(rs.getBoolean("targetable"));
template.getInfo().setTargetable(true);
//template.getInfo().setAggressive(rs.getBoolean("aggro"));
// template.getInfo().setAggressive(rs.getBoolean("aggro"));
template.getInfo().setAggressive(true);
template.getInfo().setAttackable(true); // FIXME
@@ -351,9 +351,9 @@ public class NPCTemplateConverter {
final ResultSet rs = st.getResultSet();
while (rs.next()) {
final Droplist.Item item = factory.createNPCTemplateDroplistItem();
item.setId( new ItemTemplateID(rs.getInt("itemId"), null));
item.setId(new ItemTemplateID(rs.getInt("itemId"), null));
item.setMin(rs.getInt("min"));
item.setMax( rs.getInt("max"));
item.setMax(rs.getInt("max"));
item.setChance(rs.getInt("chance"));
item.setCategory(getCategory(rs.getInt("category")));
drops.getItem().add(item);
@@ -363,7 +363,8 @@ public class NPCTemplateConverter {
return drops;
}
private static Talk fillHtmlChat(final ObjectFactory factory, int npcId) throws IOException {
private static Talk fillHtmlChat(final ObjectFactory factory, int npcId)
throws IOException {
final Talk talk = factory.createNPCTemplateTalk();
talk.setDefault("default");
for (final File file : htmlScannedFiles) {
@@ -389,8 +390,8 @@ public class NPCTemplateConverter {
return talk;
}
private static Skills fillSkillList(final ObjectFactory factory, ResultSet npcRs, int npcId)
throws SQLException {
private static Skills fillSkillList(final ObjectFactory factory,
ResultSet npcRs, int npcId) throws SQLException {
final Connection conn = npcRs.getStatement().getConnection();
final Skills skills = factory.createNPCTemplateSkills();

1
l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver.tool;
import com.l2jserver.model.template.character.CharacterClass;
public class CharacterSQLEnumGenerator {
public static void main(String[] args) {
System.out.println("== 'Character' SQL STATEMENT ==");

Some files were not shown because too many files have changed in this diff Show More