ronancpl
f439c158e2
Repelled ultimately the game-breaking issue that was introduced recently on the revamp of the login phase. Optimized the getcurrenttime calls to the OS. Made most of the handler calls fetch directly from the Server object instead, the Server itself delegated with periodically updating the current time value. The result is an slightly delayed currenttime, backed with realtime value update within minutes. Protected concurrently inventory sort handlers. Expected no more NullPointers from the sorting feature. Added a server flag to limit cash items being sold on player shops/hired merchants. Stabilized the MapleTV mechanics, and activities properly split by world. Normalized Character.wz: equipments supposed to have the "cash" property now implements it. Normalized String.wz: every item that doesn't have a "name" property now implements it. Normalized the XMLs that lost indentation on the last source update. New tool: MapleInvalidItemWithNoNameFetcher. Fetches and reports itemids throughout the XMLs that doesn't contain the "name" property and equipments that lacks "cash" property. Frolic Omniknight references aside, if you have run into any more issues regarding the new login system, please open an issue and show the steps you've done to reach the problem.
121 lines
3.0 KiB
Java
121 lines
3.0 KiB
Java
/*
|
|
This file is part of the OdinMS Maple Story Server
|
|
Copyright (C) 2008 ~ 2010 Patrick Huy <[email protected]>
|
|
Matthias Butz <[email protected]>
|
|
Jan Christian Meyer <[email protected]>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Affero General Public License version 3
|
|
as published by the Free Software Foundation. You may not use, modify
|
|
or distribute this program under any other version of the
|
|
GNU Affero General Public License.
|
|
|
|
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 Affero General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package maplenoitemnamefetcher;
|
|
|
|
/**
|
|
* Represents a pair of values.
|
|
*
|
|
* @author Frz
|
|
* @since Revision 333
|
|
* @version 1.0
|
|
*
|
|
* @param <E> The type of the left value.
|
|
* @param <F> The type of the right value.
|
|
*/
|
|
public class Pair<E, F> {
|
|
|
|
public E left;
|
|
public F right;
|
|
|
|
/**
|
|
* Class constructor - pairs two objects together.
|
|
*
|
|
* @param left The left object.
|
|
* @param right The right object.
|
|
*/
|
|
public Pair(E left, F right) {
|
|
this.left = left;
|
|
this.right = right;
|
|
}
|
|
|
|
/**
|
|
* Gets the left value.
|
|
*
|
|
* @return The left value.
|
|
*/
|
|
public E getLeft() {
|
|
return left;
|
|
}
|
|
|
|
/**
|
|
* Gets the right value.
|
|
*
|
|
* @return The right value.
|
|
*/
|
|
public F getRight() {
|
|
return right;
|
|
}
|
|
|
|
/**
|
|
* Turns the pair into a string.
|
|
*
|
|
* @return Each value of the pair as a string joined by a colon.
|
|
*/
|
|
@Override
|
|
public String toString() {
|
|
return left.toString() + ":" + right.toString();
|
|
}
|
|
|
|
/**
|
|
* Gets the hash code of this pair.
|
|
*/
|
|
@Override
|
|
public int hashCode() {
|
|
final int prime = 31;
|
|
int result = 1;
|
|
result = prime * result + ((left == null) ? 0 : left.hashCode());
|
|
result = prime * result + ((right == null) ? 0 : right.hashCode());
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Checks to see if two pairs are equal.
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
@Override
|
|
public boolean equals(Object obj) {
|
|
if (this == obj) {
|
|
return true;
|
|
}
|
|
if (obj == null) {
|
|
return false;
|
|
}
|
|
if (getClass() != obj.getClass()) {
|
|
return false;
|
|
}
|
|
final Pair other = (Pair) obj;
|
|
if (left == null) {
|
|
if (other.left != null) {
|
|
return false;
|
|
}
|
|
} else if (!left.equals(other.left)) {
|
|
return false;
|
|
}
|
|
if (right == null) {
|
|
if (other.right != null) {
|
|
return false;
|
|
}
|
|
} else if (!right.equals(other.right)) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
} |