Rename and clean up MapleCoconut

This commit is contained in:
P0nk
2021-09-09 21:54:29 +02:00
parent 2332458ed9
commit 219a2cdb3f
3 changed files with 65 additions and 66 deletions

View File

@@ -25,7 +25,7 @@ package net.server.channel.handlers;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.events.gm.MapleCoconut;
import server.events.gm.Coconut;
import server.events.gm.MapleCoconuts;
import server.maps.MapleMap;
import tools.PacketCreator;
@@ -42,7 +42,7 @@ public final class CoconutHandler extends AbstractPacketHandler {
*/
int id = p.readShort();
MapleMap map = c.getPlayer().getMap();
MapleCoconut event = map.getCoconut();
Coconut event = map.getCoconut();
MapleCoconuts nut = event.getCoconut(id);
if (!nut.isHittable()){
return;

View File

@@ -32,20 +32,19 @@ import java.util.LinkedList;
import java.util.List;
/**
*
* @author kevintjuh93
*/
//Make them better :)
public class MapleCoconut extends MapleEvent {
public class Coconut extends MapleEvent {
private MapleMap map = null;
private int MapleScore = 0;
private int StoryScore = 0;
private int countBombing = 80;
private int countFalling = 401;
private int countStopped = 20;
private List<MapleCoconuts> coconuts = new LinkedList<>();
private final List<MapleCoconuts> coconuts = new LinkedList<>();
public MapleCoconut(MapleMap map) {
public Coconut(MapleMap map) {
super(1, 50);
this.map = map;
}

View File

@@ -146,7 +146,7 @@ public class MapleMap {
private boolean eventstarted = false, isMuted = false;
private MapleSnowball snowball0 = null;
private MapleSnowball snowball1 = null;
private MapleCoconut coconut;
private Coconut coconut;
//CPQ
private int maxMobs;
@@ -3870,11 +3870,11 @@ public class MapleMap {
return fieldType == 4 || fieldType == 19;
}
public void setCoconut(MapleCoconut nut) {
public void setCoconut(Coconut nut) {
this.coconut = nut;
}
public MapleCoconut getCoconut() {
public Coconut getCoconut() {
return coconut;
}
@@ -3891,7 +3891,7 @@ public class MapleMap {
public void startEvent(final Character chr) {
if (this.mapid == 109080000 && getCoconut() == null) {
setCoconut(new MapleCoconut(this));
setCoconut(new Coconut(this));
coconut.startEvent();
} else if (this.mapid == 109040000) {
chr.setFitness(new MapleFitness(chr));