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

Code cleanup

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-14 13:35:12 -03:00
parent 4b9d52e724
commit 1e52e960f5
15 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java
View File

@@ -21,8 +21,7 @@ public abstract class AbstractGradeAArmorTemplate extends ArmorTemplate
@Override
public void penalty(Equiper user) {
if (!(user instanceof Levelable) && !(user instanceof Castable)
&& !(user instanceof Equiper))
if (!(user instanceof Levelable) && !(user instanceof Castable))
return;
final Levelable levelable = (Levelable) user;
final Castable castable = (Castable) user;

1
src/main/java/com/l2jserver/game/net/Lineage2Connection.java
View File

@@ -145,6 +145,7 @@ public class Lineage2Connection {
/**
* Get the channel
*
* @return the channel
*/
public Channel getChannel() {

2
src/main/java/com/l2jserver/model/id/factory/IDFactoryModule.java
View File

@@ -7,8 +7,8 @@ import com.google.inject.assistedinject.FactoryModuleBuilder;
import com.l2jserver.model.id.object.allocator.BitSetIDAllocator;
import com.l2jserver.model.id.object.allocator.IDAllocator;
import com.l2jserver.model.id.object.factory.CharacterIDFactory;
import com.l2jserver.model.id.object.factory.ItemIDFactory;
import com.l2jserver.model.id.object.factory.CharacterIDFactory.CharacterIDGuiceFactory;
import com.l2jserver.model.id.object.factory.ItemIDFactory;
import com.l2jserver.model.id.object.factory.ItemIDFactory.ItemIDGuiceFactory;
import com.l2jserver.model.id.template.factory.CharacterTemplateIDFactory;
import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;

2
src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java
View File

@@ -27,6 +27,6 @@ public class CharacterTemplateID extends TemplateID<CharacterTemplate> {
@Override
public CharacterTemplate getTemplate() {
return (CharacterTemplate) templateService.getTemplate(this);
return templateService.getTemplate(this);
}
}

5
src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java
View File

@@ -7,8 +7,7 @@ import com.l2jserver.model.template.ItemTemplate;
import com.l2jserver.service.game.template.TemplateService;
/**
* An {@link TemplateID} instance representing an {@link ItemTemplate}
* object
* An {@link TemplateID} instance representing an {@link ItemTemplate} object
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@@ -26,6 +25,6 @@ public class ItemTemplateID extends TemplateID<ItemTemplate> {
@Override
public ItemTemplate getTemplate() {
return (ItemTemplate) templateService.getTemplate(this);
return templateService.getTemplate(this);
}
}

5
src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java
View File

@@ -7,8 +7,7 @@ import com.l2jserver.model.template.SkillTemplate;
import com.l2jserver.service.game.template.TemplateService;
/**
* An {@link TemplateID} instance representing an {@link SkillTemplate}
* object
* An {@link TemplateID} instance representing an {@link SkillTemplate} object
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@@ -26,6 +25,6 @@ public class SkillTemplateID extends TemplateID<SkillTemplate> {
@Override
public SkillTemplate getTemplate() {
return (SkillTemplate) templateService.getTemplate(this);
return templateService.getTemplate(this);
}
}

1
src/main/java/com/l2jserver/model/template/AbstractTemplate.java
View File

@@ -18,6 +18,7 @@ public abstract class AbstractTemplate<T> implements Template<T> {
/**
* Creates a new instance
*
* @param id
*/
protected AbstractTemplate(TemplateID<?> id) {

1
src/main/java/com/l2jserver/model/world/AbstractActor.java
View File

@@ -191,6 +191,7 @@ public abstract class AbstractActor extends AbstractObject implements Actor {
/**
* @return the active effects on this actor
*/
@Override
public ActorEffects getEffects() {
return effects;
}

2
src/main/java/com/l2jserver/model/world/AbstractObject.java
View File

@@ -13,10 +13,12 @@ public abstract class AbstractObject implements WorldObject {
*/
protected ObjectID<?> id;
@Override
public ObjectID<?> getID() {
return id;
}
@Override
public void setID(ObjectID<?> id) {
if (this.id != null)
throw new IllegalStateException("ID is already set!");

18
src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java
View File

@@ -25,74 +25,92 @@ public class CharacterCalculatedAttributes implements CharacterAttributes {
this.baseAttributes = this.character.getBaseAttributes();
}
@Override
public int getIntelligence() {
return baseAttributes.getIntelligence();
}
@Override
public int getStrength() {
return baseAttributes.getStrength();
}
@Override
public int getConcentration() {
return baseAttributes.getConcentration();
}
@Override
public int getMentality() {
return baseAttributes.getMentality();
}
@Override
public int getDexterity() {
return baseAttributes.getDexterity();
}
@Override
public int getWitness() {
return baseAttributes.getWitness();
}
@Override
public int getPhysicalAttack() {
return baseAttributes.getPhysicalAttack();
}
@Override
public int getMagicalAttack() {
return baseAttributes.getMagicalAttack();
}
@Override
public int getPhysicalDefense() {
return baseAttributes.getPhysicalDefense();
}
@Override
public int getMagicalDefense() {
return baseAttributes.getMagicalDefense();
}
@Override
public int getAttackSpeed() {
return baseAttributes.getAttackSpeed();
}
@Override
public int getCastSpeed() {
return baseAttributes.getCastSpeed();
}
@Override
public int getAccuracy() {
return baseAttributes.getAccuracy();
}
@Override
public int getCriticalChance() {
return baseAttributes.getCriticalChance();
}
@Override
public int getEvasionChance() {
return baseAttributes.getEvasionChance();
}
@Override
public int getMoveSpeed() {
return baseAttributes.getMoveSpeed();
}
@Override
public int getMaxWeigth() {
return baseAttributes.getMaxWeigth();
}
@Override
public boolean canCraft() {
return baseAttributes.canCraft();
}

1
src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java
View File

@@ -44,6 +44,7 @@ public class WorldEventDispatcherImpl implements WorldEventDispatcher {
}, 0, 50);
}
@Override
public void dispatch(WorldEvent event) {
log.debug("Queing dispatch for event {}", event);
events.add(event);

1
src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
View File

@@ -9,7 +9,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.db.dao.DAOModuleMySQL5;
import com.l2jserver.model.id.ID;
import com.l2jserver.model.id.factory.IDFactoryModule;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.factory.CharacterIDFactory;
import com.l2jserver.model.world.L2Character;