From d2881942d8ae469efc5e5688cf5804d1dccbc3b7 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Thu, 9 Sep 2021 21:57:16 +0200
Subject: [PATCH] Rename and clean up MapleOxQuiz

---
 .../server/events/gm/{MapleOxQuiz.java => OxQuiz.java}   | 9 ++++-----
 src/main/java/server/maps/MapleMap.java                  | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename src/main/java/server/events/gm/{MapleOxQuiz.java => OxQuiz.java} (95%)

diff --git a/src/main/java/server/events/gm/MapleOxQuiz.java b/src/main/java/server/events/gm/OxQuiz.java
similarity index 95%
rename from src/main/java/server/events/gm/MapleOxQuiz.java
rename to src/main/java/server/events/gm/OxQuiz.java
index f028469088..b43b1ae73c 100644
--- a/src/main/java/server/events/gm/MapleOxQuiz.java
+++ b/src/main/java/server/events/gm/OxQuiz.java
@@ -35,17 +35,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
  * @author FloppyDisk
  */
-public final class MapleOxQuiz {
+public final class OxQuiz {
     private int round = 1;
     private int question = 1;
     private MapleMap map = null;
-    private int expGain = 200;
-    private static DataProvider stringData = DataProviderFactory.getDataProvider(WZFiles.ETC);
+    private final int expGain = 200;
+    private static final DataProvider stringData = DataProviderFactory.getDataProvider(WZFiles.ETC);
 
-    public MapleOxQuiz(MapleMap map) {
+    public OxQuiz(MapleMap map) {
         this.map = map;
         this.round = Randomizer.nextInt(9);
         this.question = 1;
diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java
index 8f323c889a..4ab1c20cb6 100644
--- a/src/main/java/server/maps/MapleMap.java
+++ b/src/main/java/server/maps/MapleMap.java
@@ -122,7 +122,7 @@ public class MapleMap {
     private float recovery = 1.0f;
     private int protectItem = 0;
     private boolean town;
-    private MapleOxQuiz ox;
+    private OxQuiz ox;
     private boolean isOxQuiz = false;
     private boolean dropsOn = true;
     private String onFirstUserEnter;
@@ -3753,11 +3753,11 @@ public class MapleMap {
         }
     }
 
-    public MapleOxQuiz getOx() {
+    public OxQuiz getOx() {
         return ox;
     }
 
-    public void setOx(MapleOxQuiz set) {
+    public void setOx(OxQuiz set) {
         this.ox = set;
     }
 
@@ -3900,7 +3900,7 @@ public class MapleMap {
             chr.setOla(new Ola(chr));
             chr.getOla().startOla();
         } else if (this.mapid == 109020001 && getOx() == null) {
-            setOx(new MapleOxQuiz(this));
+            setOx(new OxQuiz(this));
             getOx().sendQuestion();
             setOxQuiz(true);
         } else if (this.mapid == 109060000 && getSnowball(chr.getTeam()) == null) {