lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use static modifier when adding values to static lists and maps.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-04-08 10:30:59 +00:00
parent d4993f701e
commit bc61b48a56
262 changed files with 27272 additions and 26968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/MountEnabledSkillList.java
View File

@@ -1,37 +1,38 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.model.skills;
import java.util.ArrayList;
import java.util.List;
/**
* @author Mobius
*/
public class MountEnabledSkillList
{
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.model.skills;
import java.util.ArrayList;
import java.util.List;
/**
* @author Mobius
*/
public class MountEnabledSkillList
{
private final static List<Integer> ENABLED_SKILLS = new ArrayList<>(2);
{
ENABLED_SKILLS.add(4289); // Wyvern Breath
ENABLED_SKILLS.add(325); // Strider Siege Assault
}
public static boolean contains(int skillId)
{
return ENABLED_SKILLS.contains(skillId);
}
}
static
{
ENABLED_SKILLS.add(4289); // Wyvern Breath
ENABLED_SKILLS.add(325); // Strider Siege Assault
}
public static boolean contains(int skillId)
{
return ENABLED_SKILLS.contains(skillId);
}
}

135
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java
View File

@@ -1,69 +1,70 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.network.serverpackets.attributechange;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
/**
* @author Mobius
*/
public class ExChangeAttributeInfo implements IClientOutgoingPacket
{
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.network.serverpackets.attributechange;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
/**
* @author Mobius
*/
public class ExChangeAttributeInfo implements IClientOutgoingPacket
{
private static final Map<AttributeType, Byte> ATTRIBUTE_MASKS = new HashMap<>();
{
ATTRIBUTE_MASKS.put(AttributeType.FIRE, (byte) 1);
ATTRIBUTE_MASKS.put(AttributeType.WATER, (byte) 2);
ATTRIBUTE_MASKS.put(AttributeType.WIND, (byte) 4);
ATTRIBUTE_MASKS.put(AttributeType.EARTH, (byte) 8);
ATTRIBUTE_MASKS.put(AttributeType.HOLY, (byte) 16);
ATTRIBUTE_MASKS.put(AttributeType.DARK, (byte) 32);
}
private final int _crystalItemId;
private int _attributes;
private int _itemObjId;
public ExChangeAttributeInfo(int crystalItemId, ItemInstance item)
{
_crystalItemId = crystalItemId;
_attributes = 0;
for (AttributeType e : AttributeType.ATTRIBUTE_TYPES)
{
if (e != item.getAttackAttributeType())
{
_attributes |= ATTRIBUTE_MASKS.get(e);
}
}
}
@Override
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_CHANGE_ATTRIBUTE_INFO.writeId(packet);
packet.writeD(_crystalItemId);
packet.writeD(_attributes);
packet.writeD(_itemObjId);
return true;
}
static
{
ATTRIBUTE_MASKS.put(AttributeType.FIRE, (byte) 1);
ATTRIBUTE_MASKS.put(AttributeType.WATER, (byte) 2);
ATTRIBUTE_MASKS.put(AttributeType.WIND, (byte) 4);
ATTRIBUTE_MASKS.put(AttributeType.EARTH, (byte) 8);
ATTRIBUTE_MASKS.put(AttributeType.HOLY, (byte) 16);
ATTRIBUTE_MASKS.put(AttributeType.DARK, (byte) 32);
}
private final int _crystalItemId;
private int _attributes;
private int _itemObjId;
public ExChangeAttributeInfo(int crystalItemId, ItemInstance item)
{
_crystalItemId = crystalItemId;
_attributes = 0;
for (AttributeType e : AttributeType.ATTRIBUTE_TYPES)
{
if (e != item.getAttackAttributeType())
{
_attributes |= ATTRIBUTE_MASKS.get(e);
}
}
}
@Override
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_CHANGE_ATTRIBUTE_INFO.writeId(packet);
packet.writeD(_crystalItemId);
packet.writeD(_attributes);
packet.writeD(_itemObjId);
return true;
}
}

1
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/util/exp4j/Operators.java
View File

@@ -27,7 +27,6 @@ public abstract class Operators
private static final int INDEX_UNARYPLUS = 7;
private static final Operator[] builtinOperators = new Operator[8];
static
{
builtinOperators[INDEX_ADDITION] = new Operator("+", 2, true, Operator.PRECEDENCE_ADDITION)