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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/events/RescueGaga.java
View File

@@ -5,7 +5,7 @@
package server.events;
import client.MapleCharacter;
import client.Character;
import client.SkillFactory;
/**
@@ -34,7 +34,7 @@ public class RescueGaga extends MapleEvents {
return getCompleted();
}
public void giveSkill(MapleCharacter chr) {
public void giveSkill(Character chr) {
int skillid = 0;
switch (chr.getJobType()) {
case 0:

16
src/main/java/server/events/gm/MapleCoconut.java
View File

@@ -22,7 +22,7 @@
package server.events.gm;
import client.MapleCharacter;
import client.Character;
import server.TimerManager;
import server.maps.MapleMap;
import tools.PacketCreator;
@@ -64,7 +64,7 @@ public class MapleCoconut extends MapleEvent {
if (getMapleScore() == getStoryScore()) {
bonusTime();
} else if (getMapleScore() > getStoryScore()) {
for (MapleCharacter chr : map.getCharacters()) {
for (Character chr : map.getCharacters()) {
if (chr.getTeam() == 0) {
chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
@@ -75,7 +75,7 @@ public class MapleCoconut extends MapleEvent {
}
warpOut();
} else {
for (MapleCharacter chr : map.getCharacters()) {
for (Character chr : map.getCharacters()) {
if (chr.getTeam() == 1) {
chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
@@ -94,13 +94,13 @@ public class MapleCoconut extends MapleEvent {
map.broadcastMessage(PacketCreator.getClock(120));
TimerManager.getInstance().schedule(() -> {
if (getMapleScore() == getStoryScore()) {
for (MapleCharacter chr : map.getCharacters()) {
for (Character chr : map.getCharacters()) {
chr.sendPacket(PacketCreator.showEffect("event/coconut/lose"));
chr.sendPacket(PacketCreator.playSound("Coconut/Failed"));
}
warpOut();
} else if (getMapleScore() > getStoryScore()) {
for (MapleCharacter chr : map.getCharacters()) {
for (Character chr : map.getCharacters()) {
if (chr.getTeam() == 0) {
chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
@@ -111,7 +111,7 @@ public class MapleCoconut extends MapleEvent {
}
warpOut();
} else {
for (MapleCharacter chr : map.getCharacters()) {
for (Character chr : map.getCharacters()) {
if (chr.getTeam() == 1) {
chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
@@ -129,9 +129,9 @@ public class MapleCoconut extends MapleEvent {
public void warpOut() {
setCoconutsHittable(false);
TimerManager.getInstance().schedule(() -> {
List<MapleCharacter> chars = new ArrayList<>(map.getCharacters());
List<Character> chars = new ArrayList<>(map.getCharacters());
for (MapleCharacter chr : chars) {
for (Character chr : chars) {
if ((getMapleScore() > getStoryScore() && chr.getTeam() == 0) || (getStoryScore() > getMapleScore() && chr.getTeam() == 1)) {
chr.changeMap(109050000);
} else {

6
src/main/java/server/events/gm/MapleFitness.java
View File

@@ -22,7 +22,7 @@
package server.events.gm;
import client.MapleCharacter;
import client.Character;
import server.TimerManager;
import tools.PacketCreator;
@@ -33,13 +33,13 @@ import java.util.concurrent.ScheduledFuture;
* @author kevintjuh93
*/
public class MapleFitness {
private MapleCharacter chr;
private Character chr;
private long time = 0;
private long timeStarted = 0;
private ScheduledFuture<?> schedule = null;
private ScheduledFuture<?> schedulemsg = null;
public MapleFitness(final MapleCharacter chr) {
public MapleFitness(final Character chr) {
this.chr = chr;
this.schedule = TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() >= 109040000 && chr.getMapId() <= 109040004)

6
src/main/java/server/events/gm/MapleOla.java
View File

@@ -21,7 +21,7 @@
*/
package server.events.gm;
import client.MapleCharacter;
import client.Character;
import server.TimerManager;
import tools.PacketCreator;
@@ -32,12 +32,12 @@ import java.util.concurrent.ScheduledFuture;
* @author kevintjuh93
*/
public class MapleOla {
private MapleCharacter chr;
private Character chr;
private long time = 0;
private long timeStarted = 0;
private ScheduledFuture<?> schedule = null;
public MapleOla(final MapleCharacter chr) {
public MapleOla(final Character chr) {
this.chr = chr;
this.schedule = TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() >= 109030001 && chr.getMapId() <= 109030303)

10
src/main/java/server/events/gm/MapleOxQuiz.java
View File

@@ -21,7 +21,7 @@
*/
package server.events.gm;
import client.MapleCharacter;
import client.Character;
import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
@@ -51,7 +51,7 @@ public final class MapleOxQuiz {
this.question = 1;
}
private boolean isCorrectAnswer(MapleCharacter chr, int answer) {
private boolean isCorrectAnswer(Character chr, int answer) {
double x = chr.getPosition().getX();
double y = chr.getPosition().getY();
if ((x > -234 && y > -26 && answer == 0) || (x < -234 && y > -26 && answer == 1)) {
@@ -63,7 +63,7 @@ public final class MapleOxQuiz {
public void sendQuestion() {
int gm = 0;
for (MapleCharacter mc : map.getCharacters()) {
for (Character mc : map.getCharacters()) {
if (mc.gmLevel() > 1) {
gm++;
}
@@ -72,9 +72,9 @@ public final class MapleOxQuiz {
map.broadcastMessage(PacketCreator.showOXQuiz(round, question, true));
TimerManager.getInstance().schedule(() -> {
map.broadcastMessage(PacketCreator.showOXQuiz(round, question, true));
List<MapleCharacter> chars = new ArrayList<>(map.getCharacters());
List<Character> chars = new ArrayList<>(map.getCharacters());
for (MapleCharacter chr : chars) {
for (Character chr : chars) {
if (chr != null) // make sure they aren't null... maybe something can happen in 12 seconds.
{
if (!isCorrectAnswer(chr, getOXAnswer(round, question)) && !chr.isGM()) {

14
src/main/java/server/events/gm/MapleSnowball.java
View File

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package server.events.gm;
import client.MapleCharacter;
import client.Character;
import server.TimerManager;
import server.maps.MapleMap;
import tools.PacketCreator;
@@ -41,13 +41,13 @@ public class MapleSnowball {
private boolean hittable = false;
private int team;
private boolean winner = false;
List<MapleCharacter> characters = new LinkedList<>();
List<Character> characters = new LinkedList<>();
public MapleSnowball(int team, MapleMap map) {
this.map = map;
this.team = team;
for (MapleCharacter chr : map.getCharacters()) {
for (Character chr : map.getCharacters()) {
if (chr.getTeam() == team)
characters.add(chr);
}
@@ -56,7 +56,7 @@ public class MapleSnowball {
public void startEvent() {
if (hittable == true) return;
for (MapleCharacter chr : characters) {
for (Character chr : characters) {
if (chr != null) {
chr.sendPacket(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
chr.sendPacket(PacketCreator.getClock(600));
@@ -65,13 +65,13 @@ public class MapleSnowball {
hittable = true;
TimerManager.getInstance().schedule(() -> {
if (map.getSnowball(team).getPosition() > map.getSnowball(team == 0 ? 1 : 0).getPosition()) {
for (MapleCharacter chr : characters) {
for (Character chr : characters) {
if (chr != null)
chr.sendPacket(PacketCreator.rollSnowBall(false, 3, map.getSnowball(0), map.getSnowball(0)));
}
winner = true;
} else if (map.getSnowball(team == 0 ? 1 : 0).getPosition() > map.getSnowball(team).getPosition()) {
for (MapleCharacter chr : characters) {
for (Character chr : characters) {
if (chr != null)
chr.sendPacket(PacketCreator.rollSnowBall(false, 4, map.getSnowball(0), map.getSnowball(0)));
}
@@ -136,7 +136,7 @@ public class MapleSnowball {
}
public void message(int message) {
for (MapleCharacter chr : characters) {
for (Character chr : characters) {
if (chr != null)
chr.sendPacket(PacketCreator.snowballMessage(team, message));
}