2b44b4baa2
Fixed several cases on the Cash Shop that would freeze some player actions when triggered, requiring exit Cash Shop to unstuck. Implemented Code Coupons, supporting several items bundled on the same code, and also devised a way to automate code generation. Added a current status on-demand option on the Buyback command. Info such as "current fee" or "time remaining" are available now. Reviewed several cases where non-owned items would get stacked with owner-tagged items. Added Door support for Happyville, Crimsonwood Keep. Added worldmap tooltip support for some maps in Masteria's C. Keep and H. House. Added Masteria region to the world map. C. Keep interiors no longer relocates players to entrance after actions such as logout. Overhauled minigame mechanics: from player boxes tooltip and in-match improvements to deploy different minigame types, accordingly with item description or player choice. Fixed Amoria outskirts not relocating players to city after getting KO'ed. Fixed issues with pets, rings and cash items being assigned the same cash unique ids leading to some quirks on the cash shop inventory. Fixed an issue with the recently added HP/MP ratio update, arbitrarily taking off 1 point in certain cases. Answer positions on the explorer's 3rd job quiz are now randomed. Fixed several issues that showed up when the bcrypt system is disabled. DOT from maps such as El Nath and Aqua Road now procs at a 5sec interval, GMS-like. Improved performance of Whodrops and Search commands. Concurrently protected player interaction handlers, thus mitigating several exploits on these lines. Adjusted several expedition timers, such as Horntail, now having a more sane deadline. Concurrently protected chair modules. Fixed "seduce" debuff not working on chairs.
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 <patrick.huy@frz.cc>
|
|
Matthias Butz <matze@odinms.de>
|
|
Jan Christian Meyer <vimes@odinms.de>
|
|
|
|
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 maplecodecoupongenerator;
|
|
|
|
/**
|
|
* 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;
|
|
}
|
|
} |