Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: use Java-style array declaration

Browse Source
This commit is contained in:
P0nk
2021-04-08 07:17:03 +02:00
parent ed5a444753
commit 5e3b346053
41 changed files with 163 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/server/Server.java
View File

@@ -948,7 +948,7 @@ public class Server {
tMan.register(new BossLogTask(), 24 * 60 * 60 * 1000, timeLeft);
}
public static void main(String args[]) {
public static void main(String[] args) {
System.setProperty("wzpath", "wz");
Security.setProperty("crypto.policy", "unlimited");
AutoJCE.removeCryptographyRestrictions();

2
src/main/java/net/server/channel/Channel.java
View File

@@ -109,7 +109,7 @@ public final class Channel {
private MonitoredReadLock merchRlock = MonitoredReadLockFactory.createLock(merchantLock);
private MonitoredWriteLock merchWlock = MonitoredWriteLockFactory.createLock(merchantLock);
private MonitoredReentrantLock faceLock[] = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
private MonitoredReentrantLock[] faceLock = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
private MonitoredReentrantLock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHANNEL, true);

4
src/main/java/net/server/channel/handlers/AllianceOperationHandler.java
View File

@@ -26,9 +26,9 @@ import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.opcodes.SendOpcode;
import net.server.Server;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import net.server.guild.MapleAlliance;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.data.output.MaplePacketLittleEndianWriter;
@@ -170,7 +170,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
break;
}
case 0x08:
String ranks[] = new String[5];
String[] ranks = new String[5];
for (int i = 0; i < 5; i++) {
ranks[i] = slea.readMapleAsciiString();
}

23
src/main/java/net/server/channel/handlers/GuildOperationHandler.java
View File

@@ -21,22 +21,23 @@
*/
package net.server.channel.handlers;
import config.YamlConfig;
import net.server.guild.MapleGuildResponse;
import net.server.guild.MapleGuild;
import constants.game.GameConstants;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.MaplePacketCreator;
import client.MapleCharacter;
import java.util.HashSet;
import java.util.Set;
import client.MapleClient;
import config.YamlConfig;
import constants.game.GameConstants;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildResponse;
import net.server.world.MapleParty;
import net.server.world.World;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.HashSet;
import java.util.Set;
public final class GuildOperationHandler extends AbstractMaplePacketHandler {
private boolean isGuildNameAcceptable(String name) {
@@ -187,7 +188,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
System.out.println("[Hack] " + mc.getName() + " tried to change guild rank titles when s/he does not have permission.");
return;
}
String ranks[] = new String[5];
String[] ranks = new String[5];
for (int i = 0; i < 5; i++) {
ranks[i] = slea.readMapleAsciiString();
}

2
src/main/java/net/server/channel/handlers/MultiChatHandler.java
View File

@@ -43,7 +43,7 @@ public final class MultiChatHandler extends AbstractMaplePacketHandler {
int type = slea.readByte(); // 0 for buddys, 1 for partys
int numRecipients = slea.readByte();
int recipients[] = new int[numRecipients];
int[] recipients = new int[numRecipients];
for (int i = 0; i < numRecipients; i++) {
recipients[i] = slea.readInt();
}

2
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -234,7 +234,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
player.visitMap(player.getMap());
BuddyList bl = player.getBuddylist();
int buddyIds[] = bl.getBuddyIds();
int[] buddyIds = bl.getBuddyIds();
wserv.loggedOn(player.getName(), player.getId(), c.getChannel(), buddyIds);
for (CharacterIdChannelPair onlineBuddy : wserv.multiBuddyFind(player.getId(), buddyIds)) {
BuddylistEntry ble = bl.get(onlineBuddy.getCharacterId());

4
src/main/java/net/server/services/task/channel/EventService.java
View File

@@ -19,10 +19,10 @@
*/
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.services.BaseScheduler;
import net.server.services.BaseService;
/**
*
@@ -30,7 +30,7 @@ import net.server.services.BaseScheduler;
*/
public class EventService extends BaseService {
private EventScheduler eventSchedulers[] = new EventScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private EventScheduler[] eventSchedulers = new EventScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
public EventService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

4
src/main/java/net/server/services/task/channel/FaceExpressionService.java
View File

@@ -38,8 +38,8 @@ import java.util.Collections;
*/
public class FaceExpressionService extends BaseService {
private FaceExpressionScheduler faceExpressionSchedulers[] = new FaceExpressionScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private MonitoredReentrantLock faceLock[] = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
private FaceExpressionScheduler[] faceExpressionSchedulers = new FaceExpressionScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private MonitoredReentrantLock[] faceLock = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
public FaceExpressionService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

2
src/main/java/net/server/services/task/channel/MobAnimationService.java
View File

@@ -36,7 +36,7 @@ import java.util.Set;
*/
public class MobAnimationService extends BaseService {
private MobAnimationScheduler mobAnimationSchedulers[] = new MobAnimationScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private MobAnimationScheduler[] mobAnimationSchedulers = new MobAnimationScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
public MobAnimationService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

4
src/main/java/net/server/services/task/channel/MobClearSkillService.java
View File

@@ -19,10 +19,10 @@
*/
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.services.BaseScheduler;
import net.server.services.BaseService;
/**
*
@@ -30,7 +30,7 @@ import net.server.services.BaseScheduler;
*/
public class MobClearSkillService extends BaseService {
private MobClearSkillScheduler mobClearSkillSchedulers[] = new MobClearSkillScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private MobClearSkillScheduler[] mobClearSkillSchedulers = new MobClearSkillScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
public MobClearSkillService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

4
src/main/java/net/server/services/task/channel/MobMistService.java
View File

@@ -19,10 +19,10 @@
*/
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.services.BaseScheduler;
import net.server.services.BaseService;
/**
*
@@ -30,7 +30,7 @@ import net.server.services.BaseScheduler;
*/
public class MobMistService extends BaseService {
private MobMistScheduler mobMistSchedulers[] = new MobMistScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private MobMistScheduler[] mobMistSchedulers = new MobMistScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
public MobMistService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

2
src/main/java/net/server/services/task/channel/MobStatusService.java
View File

@@ -39,7 +39,7 @@ import java.util.Map;
*/
public class MobStatusService extends BaseService {
private MobStatusScheduler mobStatusSchedulers[] = new MobStatusScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private MobStatusScheduler[] mobStatusSchedulers = new MobStatusScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
public MobStatusService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

4
src/main/java/net/server/services/task/channel/OverallService.java
View File

@@ -19,10 +19,10 @@
*/
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.services.BaseScheduler;
import net.server.services.BaseService;
/**
*
@@ -30,7 +30,7 @@ import net.server.services.BaseScheduler;
*/
public class OverallService extends BaseService { // thanks Alex for suggesting a refactor over the several channel schedulers unnecessarily populating the Channel class
private OverallScheduler channelSchedulers[] = new OverallScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
private OverallScheduler[] channelSchedulers = new OverallScheduler[YamlConfig.config.server.CHANNEL_LOCKS];
public OverallService() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {

2
src/main/java/net/server/world/World.java
View File

@@ -1241,7 +1241,7 @@ public class World {
updateBuddies(characterId, channel, buddies, true);
}
public void loggedOn(String name, int characterId, int channel, int buddies[]) {
public void loggedOn(String name, int characterId, int channel, int[] buddies) {
updateBuddies(characterId, channel, buddies, false);
}