Support for H2 databases

Signed-off-by: Rogiel <rogiel@rogiel.com>

src/main/java/com/l2jserver/model/AbstractModel.java

@@ -32,7 +32,7 @@ public abstract class AbstractModel<T extends ID<?>> implements Model<T> {
 	/**
 	 * The database object state
 	 */
-	protected ObjectState state = ObjectState.NOT_STORED;
+	protected transient ObjectState state = ObjectState.NOT_STORED;
 
 	@Override
 	public T getID() {

src/main/java/com/l2jserver/model/id/object/CharacterID.java

@@ -31,7 +31,7 @@ public final class CharacterID extends ActorID<L2Character> {
 	/**
 	 * Data Access Object (DAO) for characters
 	 */
-	private final CharacterDAO characterDao;
+	private transient final CharacterDAO characterDao;
 
 	@Inject
 	public CharacterID(@Assisted int id, CharacterDAO characterDao) {

src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java

@@ -29,11 +29,12 @@ import com.l2jserver.service.game.template.TemplateService;
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
-public class ActorTemplateID<T extends ActorTemplate<?>> extends TemplateID<T, Integer> {
+public class ActorTemplateID<T extends ActorTemplate<?>> extends
+		TemplateID<T, Integer> {
 	/**
 	 * The template service
 	 */
-	private final TemplateService templateService;
+	private transient final TemplateService templateService;
 
 	@Inject
 	protected ActorTemplateID(@Assisted int id, TemplateService templateService) {

src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java

@@ -30,7 +30,7 @@ import com.l2jserver.service.game.template.TemplateService;
  */
 public class CharacterTemplateID extends ActorTemplateID<CharacterTemplate> {
 	@Inject
-	protected CharacterTemplateID(@Assisted int id,
+	public CharacterTemplateID(@Assisted int id,
 			TemplateService templateService) {
 		super(id, templateService);
 	}

src/main/java/com/l2jserver/model/template/CharacterTemplate.java

@@ -31,7 +31,8 @@ import com.l2jserver.model.world.character.CharacterClass;
 import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
 
 /**
- * The {@link L2Character} template. Each character instance is backed by an template.
+ * The {@link L2Character} template. Each character instance is backed by an
+ * template.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
@@ -43,9 +44,6 @@ public class CharacterTemplate extends ActorTemplate<L2Character> {
 	@XmlAttribute(name = "class")
 	protected CharacterTemplateID id = null;
 
-	@XmlAttribute(name = "class")
-	protected CharacterClass characterClass = null;
-
 	@XmlElement(name = "stats")
 	protected CharacterStatsMetadata stats = null;
 
@@ -181,14 +179,14 @@ public class CharacterTemplate extends ActorTemplate<L2Character> {
 	 * @return the character Class
 	 */
 	public CharacterClass getCharacterClass() {
-		return characterClass;
+		return CharacterClass.fromID(id.getID());
 	}
 
 	/**
 	 * @return the character race
 	 */
 	public ActorRace getRace() {
-		return characterClass.race;
+		return getCharacterClass().race;
 	}
 
 	/**

src/main/java/com/l2jserver/model/world/L2Character.java

@@ -97,11 +97,6 @@ public class L2Character extends Player {
 	 */
 	private Date lastAccess;
 
-	/**
-	 * The character stat
-	 */
-	private final CharacterStats stats = new CharacterStats(this);
-
 	/**
 	 * The character karma points
 	 */
@@ -118,12 +113,16 @@ public class L2Character extends Player {
 	// ////////////////////////////////////
 	// / RUNTIME
 	// ////////////////////////////////////
+	/**
+	 * The character stat
+	 */
+	private transient final CharacterStats stats = new CharacterStats(this);
 	/**
 	 * The character walk mode.
 	 * <p>
 	 * This field is not persisted.
 	 */
-	private CharacterMoveType moveType = CharacterMoveType.WALK;
+	private transient CharacterMoveType moveType = CharacterMoveType.WALK;
 
 	/**
 	 * The character walking mode
@@ -143,11 +142,11 @@ public class L2Character extends Player {
 	/**
 	 * The character target, if any.
 	 */
-	private ActorID<?> targetID;
+	private transient ActorID<?> targetID;
 	/**
 	 * State of the character. Will be null if it is idle
 	 */
-	private CharacterState state;
+	private transient CharacterState state;
 
 	/**
 	 * The valid states for an character
@@ -180,7 +179,7 @@ public class L2Character extends Player {
 	/**
 	 * The point the player is moving, teleporting etc...
 	 */
-	private Point targetLocation;
+	private transient Point targetLocation;
 
 	/**
 	 * Creates a new instance

src/main/java/com/l2jserver/model/world/character/CharacterInventory.java

@@ -16,8 +16,8 @@
  */
 package com.l2jserver.model.world.character;
 
+import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
 import com.l2jserver.model.world.Item;
@@ -76,7 +76,7 @@ public class CharacterInventory implements Iterable<Item> {
 	 * @param items
 	 *            the items to be added
 	 */
-	public void load(List<Item> items) {
+	public void load(Collection<Item> items) {
 		this.items.clear();
 		this.items.addAll(items);
 	}