diff --git a/data/script/template/script/template/item/AdenaItemTemplate.java b/data/script/template/script/template/item/AdenaItemTemplate.java index 1a9329d63..b776a2da4 100644 --- a/data/script/template/script/template/item/AdenaItemTemplate.java +++ b/data/script/template/script/template/item/AdenaItemTemplate.java @@ -16,11 +16,11 @@ public class AdenaItemTemplate extends ItemTemplate implements Stackable { @Override public void stack(Item... object) { - final Item item1 = object[0]; - if (object.length >= 2) { - for (int i = 1; i < object.length; i++) { - // TODO set item amount - } - } + // final Item item1 = object[0]; + // if (object.length >= 2) { + // for (int i = 1; i < object.length; i++) { + // // TODO set item amount + // } + // } } } diff --git a/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java b/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java index cbccc1cd4..1c163432c 100644 --- a/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java +++ b/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java @@ -4,9 +4,7 @@ import com.l2jserver.model.id.template.ItemTemplateID; import com.l2jserver.model.template.ArmorTemplate; import com.l2jserver.model.template.capability.Enchantable; import com.l2jserver.model.template.capability.Penalty; -import com.l2jserver.model.world.capability.Castable; import com.l2jserver.model.world.capability.Equiper; -import com.l2jserver.model.world.capability.Levelable; public abstract class AbstractGradeAArmorTemplate extends ArmorTemplate implements Enchantable, Penalty { @@ -21,12 +19,12 @@ public abstract class AbstractGradeAArmorTemplate extends ArmorTemplate @Override public void penalty(Equiper user) { - if (!(user instanceof Levelable) && !(user instanceof Castable)) - return; - final Levelable levelable = (Levelable) user; - final Castable castable = (Castable) user; - if (levelable.getLevel() < 20) { - - } + // if (!(user instanceof Levelable) && !(user instanceof Castable)) + // return; + // final Levelable levelable = (Levelable) user; + // final Castable castable = (Castable) user; + // if (levelable.getLevel() < 20) { + // + // } } } diff --git a/data/script/template/script/template/item/weapon/TestWeaponTemplate.java b/data/script/template/script/template/item/weapon/TestWeaponTemplate.java index a70979090..55a6ea337 100644 --- a/data/script/template/script/template/item/weapon/TestWeaponTemplate.java +++ b/data/script/template/script/template/item/weapon/TestWeaponTemplate.java @@ -7,6 +7,7 @@ import com.l2jserver.model.world.capability.Attacker; public class TestWeaponTemplate extends WeaponTemplate { private static final int DAMAGE_PHYSICAL = 10; private static final int DAMAGE_MAGICAL = 10; + @SuppressWarnings("unused") private static final int MAX_ENCHANT_LEVEL = 10; public TestWeaponTemplate() { diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java index 5d3105137..1c02f2e2b 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java @@ -176,4 +176,199 @@ public class CharacterCreatePacket extends AbstractClientPacket { conn.write(CharacterCreateOkPacket.INSTANCE); } } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the race + */ + public Race getRace() { + return race; + } + + /** + * @param race + * the race to set + */ + public void setRace(Race race) { + this.race = race; + } + + /** + * @return the sex + */ + public Sex getSex() { + return sex; + } + + /** + * @param sex + * the sex to set + */ + public void setSex(Sex sex) { + this.sex = sex; + } + + /** + * @return the classId + */ + public int getClassId() { + return classId; + } + + /** + * @param classId + * the classId to set + */ + public void setClassId(int classId) { + this.classId = classId; + } + + /** + * @return the intelligence + */ + public int getIntelligence() { + return intelligence; + } + + /** + * @param intelligence + * the intelligence to set + */ + public void setIntelligence(int intelligence) { + this.intelligence = intelligence; + } + + /** + * @return the strength + */ + public int getStrength() { + return strength; + } + + /** + * @param strength + * the strength to set + */ + public void setStrength(int strength) { + this.strength = strength; + } + + /** + * @return the concentration + */ + public int getConcentration() { + return concentration; + } + + /** + * @param concentration + * the concentration to set + */ + public void setConcentration(int concentration) { + this.concentration = concentration; + } + + /** + * @return the mentality + */ + public int getMentality() { + return mentality; + } + + /** + * @param mentality + * the mentality to set + */ + public void setMentality(int mentality) { + this.mentality = mentality; + } + + /** + * @return the dexterity + */ + public int getDexterity() { + return dexterity; + } + + /** + * @param dexterity + * the dexterity to set + */ + public void setDexterity(int dexterity) { + this.dexterity = dexterity; + } + + /** + * @return the witness + */ + public int getWitness() { + return witness; + } + + /** + * @param witness + * the witness to set + */ + public void setWitness(int witness) { + this.witness = witness; + } + + /** + * @return the hairStyle + */ + public CharacterHairStyle getHairStyle() { + return hairStyle; + } + + /** + * @param hairStyle + * the hairStyle to set + */ + public void setHairStyle(CharacterHairStyle hairStyle) { + this.hairStyle = hairStyle; + } + + /** + * @return the hairColor + */ + public CharacterHairColor getHairColor() { + return hairColor; + } + + /** + * @param hairColor + * the hairColor to set + */ + public void setHairColor(CharacterHairColor hairColor) { + this.hairColor = hairColor; + } + + /** + * @return the face + */ + public CharacterFace getFace() { + return face; + } + + /** + * @param face + * the face to set + */ + public void setFace(CharacterFace face) { + this.face = face; + } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java b/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java index 50f5b1ebb..a8a129d88 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java @@ -1,8 +1,6 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; @@ -18,12 +16,6 @@ public class RequestManorList extends AbstractClientPacket { public static final int OPCODE1 = 0xd0; public static final int OPCODE2 = 0x01; - /** - * The logger - */ - private static final Logger log = LoggerFactory - .getLogger(RequestManorList.class); - @Override public void read(Lineage2Connection conn, ChannelBuffer buffer) { } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java index b510b3f01..2e0a297f4 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java @@ -20,7 +20,7 @@ public class CharacterSelectionListPacket extends AbstractServerPacket { private final String loginName; private final int sessionId; - private int lastCharacterId; + // private int lastCharacterId; private final L2Character[] characters; public CharacterSelectionListPacket(String loginName, int sessionId, @@ -28,7 +28,7 @@ public class CharacterSelectionListPacket extends AbstractServerPacket { super(OPCODE); this.loginName = loginName; this.sessionId = sessionId; - this.lastCharacterId = lastCharacterId; + // this.lastCharacterId = lastCharacterId; this.characters = characters; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/InventoryPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/InventoryPacket.java index cf186a063..7021702ac 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/InventoryPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/InventoryPacket.java @@ -17,12 +17,12 @@ public class InventoryPacket extends AbstractServerPacket { */ public static final int OPCODE = 0x11; - private CharacterInventory inventory; + // private CharacterInventory inventory; private boolean showWindow = false; public InventoryPacket(CharacterInventory inventory) { super(OPCODE); - this.inventory = inventory; + // this.inventory = inventory; } @Override diff --git a/src/main/java/com/l2jserver/model/world/Player.java b/src/main/java/com/l2jserver/model/world/Player.java index a98e03b14..1e290ff52 100644 --- a/src/main/java/com/l2jserver/model/world/Player.java +++ b/src/main/java/com/l2jserver/model/world/Player.java @@ -3,7 +3,6 @@ package com.l2jserver.model.world; import com.l2jserver.model.world.capability.Actor; import com.l2jserver.model.world.capability.Playable; import com.l2jserver.model.world.capability.Teleportable; -import com.l2jserver.model.world.player.PlayerTeleportEvent; import com.l2jserver.util.Coordinate; /** @@ -16,9 +15,9 @@ public abstract class Player extends AbstractActor implements Playable, Actor, Teleportable { @Override public void teleport(Coordinate coordinate) { - final PlayerTeleportEvent event = new PlayerTeleportEvent(this, - coordinate); - this.setPosition(coordinate); + // final PlayerTeleportEvent event = new PlayerTeleportEvent(this, + // coordinate); + // this.setPosition(coordinate); // event.dispatch(); } } diff --git a/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java b/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java index 555914890..6288f4073 100644 --- a/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java +++ b/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java @@ -49,7 +49,8 @@ public class ProxyConfigurationService extends AbstractService implements @Override public void start() throws ServiceStartException { if (!directory.exists()) - directory.mkdirs(); + if (!directory.mkdirs()) + throw new ServiceStartException("Failed to create directories"); } @Override