mirror of
https://github.com/Rogiel/l2jserver2
synced 2025-12-10 09:22:49 +00:00
@@ -36,7 +36,6 @@ public class Log4JLoggingService extends AbstractService implements
|
||||
LoggingService {
|
||||
private Logger rootLogger;
|
||||
private Logger l2jLogger;
|
||||
private Logger scriptLogger;
|
||||
private Logger nettyLogger;
|
||||
|
||||
@Override
|
||||
@@ -47,7 +46,6 @@ public class Log4JLoggingService extends AbstractService implements
|
||||
BasicConfigurator.configure();
|
||||
rootLogger = Logger.getRootLogger();
|
||||
l2jLogger = Logger.getLogger("com.l2jserver");
|
||||
scriptLogger = Logger.getLogger("script");
|
||||
nettyLogger = Logger.getLogger("org.jboss.netty");
|
||||
|
||||
rootLogger.removeAllAppenders();
|
||||
@@ -55,7 +53,6 @@ public class Log4JLoggingService extends AbstractService implements
|
||||
rootLogger.addAppender(new ConsoleAppender(layout, "System.err"));
|
||||
|
||||
l2jLogger.setLevel(Level.INFO);
|
||||
scriptLogger.setLevel(Level.INFO);
|
||||
nettyLogger.setLevel(Level.DEBUG);
|
||||
Logger.getLogger("com.l2jserver.model.id.object.allocator").setLevel(Level.WARN);
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import com.google.common.base.Preconditions;
|
||||
import com.google.inject.Inject;
|
||||
import com.l2jserver.model.server.AttackHit;
|
||||
import com.l2jserver.model.server.attack.AttackCalculator;
|
||||
import com.l2jserver.model.server.attack.AttackCalculator.AttackCalculatorType;
|
||||
import com.l2jserver.model.server.attack.AttackCalculatorContext;
|
||||
import com.l2jserver.model.server.attack.PhysicalAttackCalculator;
|
||||
import com.l2jserver.model.world.Actor;
|
||||
@@ -90,8 +91,9 @@ public class AttackServiceImpl extends AbstractService implements AttackService
|
||||
|
||||
@Override
|
||||
public AttackHit call() throws Exception {
|
||||
final double damage = PHYSICAL_ATTACK_CALCULATOR
|
||||
.calculate(new AttackCalculatorContext(attacker, target));
|
||||
final double damage = PHYSICAL_ATTACK_CALCULATOR.calculate(
|
||||
AttackCalculatorType.DAMAGE, new AttackCalculatorContext(
|
||||
attacker, target));
|
||||
// TODO calculate miss
|
||||
// TODO calculate critical
|
||||
// TODO calculate soulshot
|
||||
|
||||
@@ -92,7 +92,7 @@ public class CharacterServiceImpl extends AbstractService implements
|
||||
* The {@link WorldService}
|
||||
*/
|
||||
private final WorldService worldService;
|
||||
/**
|
||||
/*
|
||||
* The {@link WorldService} event dispatcher
|
||||
*/
|
||||
private final WorldEventDispatcher eventDispatcher;
|
||||
@@ -156,7 +156,7 @@ public class CharacterServiceImpl extends AbstractService implements
|
||||
character.setOnline(true);
|
||||
|
||||
// inventory interfere on calculators
|
||||
character.getStats().updateCalculators();
|
||||
character.getStats().updateCalculator();
|
||||
|
||||
// chat listener
|
||||
final ChatChannelListener globalChatListener = new ChatChannelListener() {
|
||||
|
||||
Reference in New Issue
Block a user