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

cleanup: use for-each loop where applicable

Browse Source
This commit is contained in:
P0nk
2021-04-08 07:36:38 +02:00
parent 0ff8a80ef2
commit 5c6f515d18
16 changed files with 103 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/audit/ThreadTracker.java
View File

@@ -120,8 +120,8 @@ public class ThreadTracker {
private static String printThreadStack(StackTraceElement[] list, String dateFormat) {
String s = "----------------------------\r\n" + dateFormat + "\r\n";
for(int i = 0; i < list.length; i++) {
s += (" " + list[i].toString() + "\r\n");
for (StackTraceElement stackTraceElement : list) {
s += (" " + stackTraceElement.toString() + "\r\n");
}
return s;

4
src/main/java/net/server/audit/locks/active/TrackerReadLock.java
View File

@@ -136,8 +136,8 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
private static String printStackTrace(StackTraceElement[] list) {
String s = "";
for(int i = 0; i < list.length; i++) {
s += (" " + list[i].toString() + "\r\n");
for (StackTraceElement stackTraceElement : list) {
s += (" " + stackTraceElement.toString() + "\r\n");
}
return s;

4
src/main/java/net/server/audit/locks/active/TrackerReentrantLock.java
View File

@@ -140,8 +140,8 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
private static String printStackTrace(StackTraceElement[] list) {
String s = "";
for(int i = 0; i < list.length; i++) {
s += (" " + list[i].toString() + "\r\n");
for (StackTraceElement stackTraceElement : list) {
s += (" " + stackTraceElement.toString() + "\r\n");
}
return s;

4
src/main/java/net/server/audit/locks/active/TrackerWriteLock.java
View File

@@ -136,8 +136,8 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
private static String printStackTrace(StackTraceElement[] list) {
String s = "";
for(int i = 0; i < list.length; i++) {
s += (" " + list[i].toString() + "\r\n");
for (StackTraceElement stackTraceElement : list) {
s += (" " + stackTraceElement.toString() + "\r\n");
}
return s;

4
src/main/java/net/server/audit/locks/empty/AbstractEmptyLock.java
View File

@@ -13,8 +13,8 @@ public abstract class AbstractEmptyLock {
String df = dateFormat.format(new Date());
String s = "\r\n" + df + "\r\n";
for(int i = 0; i < list.length; i++) {
s += (" " + list[i].toString() + "\r\n");
for (StackTraceElement stackTraceElement : list) {
s += (" " + stackTraceElement.toString() + "\r\n");
}
s += "----------------------------\r\n\r\n";

19
src/main/java/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -21,9 +21,11 @@
*/
package net.server.channel.handlers;
import java.util.Arrays;
import java.util.List;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory;
@@ -34,11 +36,9 @@ import server.quest.MapleQuest;
import tools.MaplePacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import java.util.Arrays;
import java.util.List;
public final class AdminCommandHandler extends AbstractMaplePacketHandler {
@@ -53,8 +53,7 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler {
switch (mode) {
case 0x00: // Level1~Level8 & Package1~Package2
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(slea.readInt());
for (int z = 0; z < toSpawn.length; z++) {
int[] toSpawnChild = toSpawn[z];
for (int[] toSpawnChild : toSpawn) {
if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
}

7
src/main/java/net/server/channel/handlers/UseSummonBagHandler.java
View File

@@ -24,12 +24,12 @@ package net.server.channel.handlers;
import client.MapleClient;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import tools.Randomizer;
import net.AbstractMaplePacketHandler;
import client.inventory.manipulator.MapleInventoryManipulator;
import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory;
import tools.MaplePacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -52,8 +52,7 @@ public final class UseSummonBagHandler extends AbstractMaplePacketHandler {
if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) {
MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false);
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId);
for (int z = 0; z < toSpawn.length; z++) {
int[] toSpawnChild = toSpawn[z];
for (int[] toSpawnChild : toSpawn) {
if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
}

8
src/main/java/net/server/handlers/login/CreateCharHandler.java
View File

@@ -22,7 +22,9 @@
package net.server.handlers.login;
import client.MapleClient;
import client.creator.novice.*;
import client.creator.novice.BeginnerCreator;
import client.creator.novice.LegendCreator;
import client.creator.novice.NoblesseCreator;
import net.AbstractMaplePacketHandler;
import tools.FilePrinter;
import tools.MaplePacketCreator;
@@ -66,8 +68,8 @@ public final class CreateCharHandler extends AbstractMaplePacketHandler {
int gender = slea.readByte();
int [] items = new int [] {weapon, top, bottom, shoes, hair, face};
for (int i = 0; i < items.length; i++){
if (!isLegal(items[i])) {
for (int item : items) {
if (!isLegal(item)) {
FilePrinter.printError(FilePrinter.EXPLOITS + name + ".txt", "Owner from account '" + c.getAccountName() + "' tried to packet edit in char creation.");
c.disconnect(true, false);
return;

4
src/main/java/net/server/services/ServicesManager.java
View File

@@ -41,8 +41,8 @@ public class ServicesManager {
}
public void shutdown() {
for (int i = 0; i < services.length; i++) {
services[i].dispose();
for (Service service : services) {
service.dispose();
}
services = null;
}

4
src/main/java/provider/wz/WZIMGEntry.java
View File

@@ -62,10 +62,10 @@ public class WZIMGEntry implements MapleData {
return ((MapleData) getParent()).getChildByPath(path.substring(path.indexOf("/") + 1));
}
MapleData ret = this;
for (int x = 0; x < segments.length; x++) {
for (String segment : segments) {
boolean foundChild = false;
for (MapleData child : ret.getChildren()) {
if (child.getName().equals(segments[x])) {
if (child.getName().equals(segment)) {
ret = child;
foundChild = true;
break;

6
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -776,9 +776,9 @@ public class AbstractPlayerInteraction {
public void removeHPQItems() {
int[] items = {4001095, 4001096, 4001097, 4001098, 4001099, 4001100, 4001101};
for (int i = 0; i < items.length; i ++) {
removePartyItems(items[i]);
}
for (int item : items) {
removePartyItems(item);
}
}
public void removePartyItems(int id) {

4
src/main/java/server/expeditions/MapleExpedition.java
View File

@@ -247,8 +247,8 @@ dispose(false);
}
public void monsterKilled(MapleCharacter chr, MapleMonster mob) {
for (int i = 0; i < EXPEDITION_BOSSES.length; i++) {
if (mob.getId() == EXPEDITION_BOSSES[i]) { //If the monster killed was a boss
for (int expeditionBoss : EXPEDITION_BOSSES) {
if (mob.getId() == expeditionBoss) { //If the monster killed was a boss
String timeStamp = new SimpleDateFormat("HH:mm:ss").format(new Date());
bossLogs.add(">" + mob.getName() + " was killed after " + LogHelper.getTimeString(startTime) + " - " + timeStamp + "\r\n");
return;

18
src/main/java/server/maps/MapleMap.java
View File

@@ -2187,13 +2187,13 @@ public class MapleMap {
final Point dropPos = new Point(pos);
dropPos.x -= (12 * list.size());
for(int i = 0; i < list.size(); i++) {
if(list.get(i) == 0) {
for (Integer integer : list) {
if (integer == 0) {
spawnMesoDrop(owner != null ? 10 * owner.getMesoRate() : 10, calcDropPos(dropPos, pos), dropper, owner, playerDrop, (byte) (ffaDrop ? 2 : 0));
} else {
final Item drop;
int randomedId = list.get(i);
int randomedId = integer;
if (ItemConstants.getInventoryType(randomedId) != MapleInventoryType.EQUIP) {
drop = new Item(randomedId, (short) 0, (short) (rnd.nextInt(copies) + minCopies));
@@ -2203,7 +2203,7 @@ public class MapleMap {
spawnItemDrop(dropper, owner, drop, calcDropPos(dropPos, pos), ffaDrop, playerDrop);
}
dropPos.x += 25;
}
}
@@ -2459,10 +2459,10 @@ public class MapleMap {
}
MaplePet[] pets = chr.getPets();
for (int i = 0; i < pets.length; i++) {
if (pets[i] != null) {
pets[i].setPos(getGroundBelow(chr.getPosition()));
chr.announce(MaplePacketCreator.showPet(chr, pets[i], false, false));
for (MaplePet pet : pets) {
if (pet != null) {
pet.setPos(getGroundBelow(chr.getPosition()));
chr.announce(MaplePacketCreator.showPet(chr, pet, false, false));
} else {
break;
}

9
src/main/java/tools/HexTool.java
View File

@@ -22,6 +22,7 @@
package tools;
import constants.string.CharsetConstants;
import java.io.ByteArrayOutputStream;
public class HexTool {
@@ -35,8 +36,8 @@ public class HexTool {
public static String toString(byte[] bytes) {
StringBuilder hexed = new StringBuilder();
for (int i = 0; i < bytes.length; i++) {
hexed.append(toString(bytes[i]));
for (byte aByte : bytes) {
hexed.append(toString(aByte));
hexed.append(' ');
}
return hexed.substring(0, hexed.length() - 1);
@@ -44,8 +45,8 @@ public class HexTool {
public static String toCompressedString(byte[] bytes) {
StringBuilder hexed = new StringBuilder();
for (int i = 0; i < bytes.length; i++) {
hexed.append(toString(bytes[i]));
for (byte aByte : bytes) {
hexed.append(toString(aByte));
}
return hexed.substring(0, hexed.length());
}

100
src/main/java/tools/MaplePacketCreator.java
View File

@@ -112,11 +112,11 @@ public class MaplePacketCreator {
private static void addRemainingSkillInfo(final MaplePacketLittleEndianWriter mplew, MapleCharacter chr) {
int[] remainingSp = chr.getRemainingSps();
int effectiveLength = 0;
for (int i = 0; i < remainingSp.length; i++) {
if (remainingSp[i] > 0) {
effectiveLength++;
}
for (int j : remainingSp) {
if (j > 0) {
effectiveLength++;
}
}
mplew.write(effectiveLength);
for (int i = 0; i < remainingSp.length; i++) {
@@ -489,25 +489,23 @@ public class MaplePacketCreator {
Map<Skill, MapleCharacter.SkillEntry> skills = chr.getSkills();
int skillsSize = skills.size();
// We don't want to include any hidden skill in this, so subtract them from the size list and ignore them.
for (Iterator<Entry<Skill, SkillEntry>> it = skills.entrySet().iterator(); it.hasNext();) {
Entry<Skill, MapleCharacter.SkillEntry> skill = it.next();
if (GameConstants.isHiddenSkills(skill.getKey().getId())) {
skillsSize--;
}
for (Entry<Skill, SkillEntry> skill : skills.entrySet()) {
if (GameConstants.isHiddenSkills(skill.getKey().getId())) {
skillsSize--;
}
}
mplew.writeShort(skillsSize);
for (Iterator<Entry<Skill, SkillEntry>> it = skills.entrySet().iterator(); it.hasNext();) {
Entry<Skill, MapleCharacter.SkillEntry> skill = it.next();
if (GameConstants.isHiddenSkills(skill.getKey().getId())) {
continue;
}
mplew.writeInt(skill.getKey().getId());
mplew.writeInt(skill.getValue().skillevel);
addExpirationTime(mplew, skill.getValue().expiration);
if (skill.getKey().isFourthJob()) {
mplew.writeInt(skill.getValue().masterlevel);
}
for (Entry<Skill, SkillEntry> skill : skills.entrySet()) {
if (GameConstants.isHiddenSkills(skill.getKey().getId())) {
continue;
}
mplew.writeInt(skill.getKey().getId());
mplew.writeInt(skill.getValue().skillevel);
addExpirationTime(mplew, skill.getValue().expiration);
if (skill.getKey().isFourthJob()) {
mplew.writeInt(skill.getValue().masterlevel);
}
}
mplew.writeShort(chr.getAllCooldowns().size());
for (PlayerCoolDownValueHolder cooling : chr.getAllCooldowns()) {
mplew.writeInt(cooling.skillId);
@@ -2767,11 +2765,10 @@ public class MaplePacketCreator {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.RECOMMENDED_WORLD_MESSAGE.getValue());
mplew.write(worlds.size());//size
for (Iterator<Pair<Integer, String>> it = worlds.iterator(); it.hasNext();) {
Pair<Integer, String> world = it.next();
mplew.writeInt(world.getLeft());
mplew.writeMapleAsciiString(world.getRight());
}
for (Pair<Integer, String> world : worlds) {
mplew.writeInt(world.getLeft());
mplew.writeMapleAsciiString(world.getRight());
}
return mplew.getPacket();
}
@@ -3151,10 +3148,10 @@ public class MaplePacketCreator {
masks[pos + i] |= statup.getValue() >> 32 * i;
}
}
for (int i = 0; i < masks.length; i++) {
mplew.writeInt(masks[i]);
}
for (int mask : masks) {
mplew.writeInt(mask);
}
}
public static byte[] cancelDebuff(long mask) {
@@ -3483,9 +3480,9 @@ public class MaplePacketCreator {
mplew.write(0); //speaker
mplew.writeMapleAsciiString(talk);
mplew.write(styles.length);
for (int i = 0; i < styles.length; i++) {
mplew.writeInt(styles[i]);
}
for (int style : styles) {
mplew.writeInt(style);
}
return mplew.getPacket();
}
@@ -5586,9 +5583,9 @@ public class MaplePacketCreator {
List<Pair<Item, MapleInventoryType>> items = ItemFactory.MERCHANT.loadItems(chr.getId(), false);
mplew.write(items.size());
for (int i = 0; i < items.size(); i++) {
addItemInfo(mplew, items.get(i).getLeft(), true);
}
for (Pair<Item, MapleInventoryType> item : items) {
addItemInfo(mplew, item.getLeft(), true);
}
} catch (SQLException e) {
e.printStackTrace();
}
@@ -5771,10 +5768,10 @@ public class MaplePacketCreator {
List<Pair<String, Byte>> msgList = hm.getMessages();
mplew.writeShort(msgList.size());
for (int i = 0; i < msgList.size(); i++) {
mplew.writeMapleAsciiString(msgList.get(i).getLeft());
mplew.write(msgList.get(i).getRight());
}
for (Pair<String, Byte> stringBytePair : msgList) {
mplew.writeMapleAsciiString(stringBytePair.getLeft());
mplew.write(stringBytePair.getRight());
}
} else {
mplew.writeShort(0);
}
@@ -6042,20 +6039,19 @@ public class MaplePacketCreator {
mplew.writeInt(page);
mplew.write(1);
mplew.write(1);
for (int i = 0; i < items.size(); i++) {
MTSItemInfo item = items.get(i);
addItemInfo(mplew, item.getItem(), true);
mplew.writeInt(item.getID()); //id
mplew.writeInt(item.getTaxes()); //this + below = price
mplew.writeInt(item.getPrice()); //price
mplew.writeInt(0);
mplew.writeLong(getTime(item.getEndingDate()));
mplew.writeMapleAsciiString(item.getSeller()); //account name (what was nexon thinking?)
mplew.writeMapleAsciiString(item.getSeller()); //char name
for (int j = 0; j < 28; j++) {
mplew.write(0);
}
for (MTSItemInfo item : items) {
addItemInfo(mplew, item.getItem(), true);
mplew.writeInt(item.getID()); //id
mplew.writeInt(item.getTaxes()); //this + below = price
mplew.writeInt(item.getPrice()); //price
mplew.writeInt(0);
mplew.writeLong(getTime(item.getEndingDate()));
mplew.writeMapleAsciiString(item.getSeller()); //account name (what was nexon thinking?)
mplew.writeMapleAsciiString(item.getSeller()); //char name
for (int j = 0; j < 28; j++) {
mplew.write(0);
}
}
mplew.write(1);
return mplew.getPacket();
}

9
src/main/java/tools/data/output/GenericLittleEndianWriter.java
View File

@@ -21,10 +21,11 @@
*/
package tools.data.output;
import java.awt.Point;
import java.nio.charset.Charset;
import constants.string.CharsetConstants.MapleLanguageType;
import java.awt.*;
import java.nio.charset.Charset;
/**
* Provides a generic writer of a little-endian sequence of bytes.
*
@@ -59,8 +60,8 @@ public class GenericLittleEndianWriter implements LittleEndianWriter {
*/
@Override
public void write(byte[] b) {
for (int x = 0; x < b.length; x++) {
bos.writeByte(b[x]);
for (byte value : b) {
bos.writeByte(value);
}
}