Rename and clean up MapleCoconut

src/main/java/net/server/channel/handlers/CoconutHandler.java

@@ -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;

src/main/java/server/events/gm/Coconut.java

@@ -32,32 +32,31 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- *
  * @author kevintjuh93
  */
 //Make them better :)
-public class MapleCoconut 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<>();
+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 final List<MapleCoconuts> coconuts = new LinkedList<>();
 
-       public MapleCoconut(MapleMap map) {
-           super(1, 50);
-           this.map = map;
-       }
+    public Coconut(MapleMap map) {
+        super(1, 50);
+        this.map = map;
+    }
 
-       public void startEvent() {
-           map.startEvent();
-           for (int i = 0; i < 506; i++) {
-                coconuts.add(new MapleCoconuts(i));
-            }
-           map.broadcastMessage(PacketCreator.hitCoconut(true, 0, 0));
-           setCoconutsHittable(true);
-           map.broadcastMessage(PacketCreator.getClock(300));
+    public void startEvent() {
+        map.startEvent();
+        for (int i = 0; i < 506; i++) {
+            coconuts.add(new MapleCoconuts(i));
+        }
+        map.broadcastMessage(PacketCreator.hitCoconut(true, 0, 0));
+        setCoconutsHittable(true);
+        map.broadcastMessage(PacketCreator.getClock(300));
 
         TimerManager.getInstance().schedule(() -> {
             if (map.getId() == 109080000) {
@@ -88,10 +87,10 @@ public class MapleCoconut extends MapleEvent {
                 }
             }
         }, 300000);
-       }
+    }
 
-       public void bonusTime() {
-           map.broadcastMessage(PacketCreator.getClock(120));
+    public void bonusTime() {
+        map.broadcastMessage(PacketCreator.getClock(120));
         TimerManager.getInstance().schedule(() -> {
             if (getMapleScore() == getStoryScore()) {
                 for (Character chr : map.getCharacters()) {
@@ -100,34 +99,34 @@ public class MapleCoconut extends MapleEvent {
                 }
                 warpOut();
             } else if (getMapleScore() > getStoryScore()) {
-                    for (Character chr : map.getCharacters()) {
-                        if (chr.getTeam() == 0) {
-                            chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
-                            chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
-                        } else {
-                            chr.sendPacket(PacketCreator.showEffect("event/coconut/lose"));
-                            chr.sendPacket(PacketCreator.playSound("Coconut/Failed"));
-                        }
+                for (Character chr : map.getCharacters()) {
+                    if (chr.getTeam() == 0) {
+                        chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
+                        chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
+                    } else {
+                        chr.sendPacket(PacketCreator.showEffect("event/coconut/lose"));
+                        chr.sendPacket(PacketCreator.playSound("Coconut/Failed"));
                     }
-                    warpOut();
-                } else {
-                    for (Character chr : map.getCharacters()) {
-                        if (chr.getTeam() == 1) {
-                            chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
-                            chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
-                        } else {
-                            chr.sendPacket(PacketCreator.showEffect("event/coconut/lose"));
-                            chr.sendPacket(PacketCreator.playSound("Coconut/Failed"));
-                        }
-                    }
-                    warpOut();
                 }
+                warpOut();
+            } else {
+                for (Character chr : map.getCharacters()) {
+                    if (chr.getTeam() == 1) {
+                        chr.sendPacket(PacketCreator.showEffect("event/coconut/victory"));
+                        chr.sendPacket(PacketCreator.playSound("Coconut/Victory"));
+                    } else {
+                        chr.sendPacket(PacketCreator.showEffect("event/coconut/lose"));
+                        chr.sendPacket(PacketCreator.playSound("Coconut/Failed"));
+                    }
+                }
+                warpOut();
+            }
         }, 120000);
 
-       }
+    }
 
-       public void warpOut() {
-          setCoconutsHittable(false);
+    public void warpOut() {
+        setCoconutsHittable(false);
         TimerManager.getInstance().schedule(() -> {
             List<Character> chars = new ArrayList<>(map.getCharacters());
 
@@ -140,23 +139,23 @@ public class MapleCoconut extends MapleEvent {
             }
             map.setCoconut(null);
         }, 12000);
-       }
+    }
 
-       public int getMapleScore() {
-           return MapleScore;
-       }
+    public int getMapleScore() {
+        return MapleScore;
+    }
 
-       public int getStoryScore() {
-           return StoryScore;
-       }
+    public int getStoryScore() {
+        return StoryScore;
+    }
 
-       public void addMapleScore() {
-           this.MapleScore += 1;
-       }
+    public void addMapleScore() {
+        this.MapleScore += 1;
+    }
 
-       public void addStoryScore() {
-           this.StoryScore += 1;
-       }
+    public void addStoryScore() {
+        this.StoryScore += 1;
+    }
 
     public int getBombings() {
         return countBombing;

src/main/java/server/maps/MapleMap.java

@@ -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));