Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 05:55:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE on mythicmobs

Browse Source
This commit is contained in:
montlikadani 2020-03-21 13:18:27 +01:00
parent 42969fb8b3
commit 9fa5dfb2aa
21 changed files with 5 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/MythicMobs-4.6.5.jar
View File

Binary file not shown.

BIN
libs/MythicMobs-4.9.0.jar Normal file
View File

Binary file not shown.

4
pom.xml
View File

@ -73,9 +73,9 @@
<dependency>
<groupId>io.lumine.xikage.mythicmobs</groupId>
<artifactId>MythicMobs</artifactId>
<version>4.6.5</version>
<version>4.9.0</version>
<scope>system</scope>
<systemPath>${basedir}/libs/MythicMobs-4.6.5.jar</systemPath>
<systemPath>${basedir}/libs/MythicMobs-4.9.0.jar</systemPath>
</dependency>
<!-- WorldGuard old version -->
<dependency>

13
src/main/java/com/gamingmesh/jobs/.gitignore vendored
View File

@ -1,13 +0,0 @@
/HookEconomyTask.class
/Jobs.class
/Jobs.class
/PermissionHandler.class
/PlayerManager.class
/Jobs$1.class
/PlayerManager$1.class
/NMS.class
/JobsPlugin.class
/PlayerManager$BoostOf.class
/PermissionManager.class
/PermissionManager$prm.class
/PlayerManager$2.class

4
src/main/java/com/gamingmesh/jobs/Gui/.gitignore vendored
View File

@ -1,4 +0,0 @@
/Gui.class
/GuiInfoList.class
/GuiTools.class
/GuiManager.class

7
src/main/java/com/gamingmesh/jobs/Signs/.gitignore vendored
View File

@ -1,7 +0,0 @@
/TopSignStuff.class
/Sign.class
/SignInfo.class
/SignUtil.class
/SignUtil$1.class
/SignUtil$2.class
/SignUtil$3.class

9
src/main/java/com/gamingmesh/jobs/actions/.gitignore vendored
View File

@ -1,9 +0,0 @@
/BlockActionInfo.class
/EntityActionInfo.class
/ItemActionInfo.class
/MaterialActionInfo.class
/EnchantActionInfo.class
/CustomKillInfo.class
/MMKillInfo.class
/WxploreActionInfo.class
/ExploreActionInfo.class

11
src/main/java/com/gamingmesh/jobs/api/.gitignore vendored
View File

@ -1,11 +0,0 @@
/JobsLevelUp.class
/JobsJoin.class
/JobsLeave.class
/JobsPayment.class
/JobsJoinEvent.class
/JobsLeaveEvent.class
/JobsLevelUpEvent.class
/JobsPaymentEvent.class
/JobsChunkChangeEvent.class
/JobsExpGainEvent.class
/JobsAreaSelectionEvent.class

8
src/main/java/com/gamingmesh/jobs/commands/.gitignore vendored
View File

@ -1,8 +0,0 @@
/JobCommand.class
/JobsCommands.class
/JobsCommands$1.class
/Cmd.class
/CMICommands.class
/CMICommands$1.class
/oldcommands.class
/oldcommands$1.class

60
src/main/java/com/gamingmesh/jobs/commands/list/.gitignore vendored
View File

@ -1,60 +0,0 @@
/fixnames.class
/aaa.class
/aaa2.class
/aaa3.class
/aaa4.class
/aaa5.class
/aaa6.class
/convert.class
/join.class
/leave.class
/leaveall.class
/info.class
/aaa7.class
/stats.class
/toggle.class
/aaa8.class
/aaa10.class
/aaa9.class
/expboost.class
/moneyboost.class
/archive.class
/playerinfo.class
/reload.class
/browse.class
/fire.class
/fireall.class
/employ.class
/promote.class
/demote.class
/grantxp.class
/removexp.class
/transfer.class
/signupdate.class
/gtop.class
/top.class
/give.class
/limit.class
/log.class
/glog.class
/glog$1.class
/pointboost.class
/points.class
/shop.class
/bonus.class
/editpoints.class
/blockinfo.class
/test.class
/purge.class
/saveall.class
/fill.class
/fillprot.class
/fillprot$1.class
/bp$1.class
/bp.class
/entitylist.class
/iteminfo.class
/area.class
/resetlimit.class
/exp.class
/exp$Action.class

34
src/main/java/com/gamingmesh/jobs/config/.gitignore vendored
View File

@ -1,34 +0,0 @@
/CommentedYamlConfiguration.class
/ConfigManager.class
/JobConfig.class
/JobsConfiguration.class
/YmlMaker.class
/TitleSettings.class
/TitleManager.class
/RestrictedManager.class
/RestrictedBlockManager.class
/LanguageManager.class
/ScheduleUtil$1.class
/ScheduleUtil$2.class
/ScheduleUtil.class
/ScheduleManager$1.class
/ScheduleManager$2.class
/ScheduleManager.class
/TranslateName.class
/NameTranslatorManager.class
/RestrictedAreaManager.class
/JobsGeneralConfig.class
/JobsConfig.class
/GeneralConfigManager.class
/ShopManager.class
/Scboard$1.class
/Scboard.class
/ScboardManager$1.class
/ScboardManager.class
/Explore.class
/ExploreManager.class
/BossBarManager$1.class
/BossBarManager.class
/BlockProtectionManager.class
/ScheduleManager$3.class
/ExploreManager$1.class

47
src/main/java/com/gamingmesh/jobs/container/.gitignore vendored
View File

@ -1,47 +0,0 @@
/ActionInfo.class
/ActionType.class
/BaseActionInfo.class
/DisplayMethod.class
/Job.class
/JobInfo.class
/JobPermission.class
/JobProgression.class
/JobsPlayer.class
/RestrictedArea.class
/Title.class
/JobCommands.class
/ItemData.class
/PaymentData.class
/JobItems.class
/Convert.class
/TopList.class
/JobsLeaveEvent.class
/NameList.class
/Schedule.class
/Log.class
/LogAmounts.class
/JobConditions.class
/JobLimitedItems.class
/ExploreRegion.class
/ExploreChunk.class
/ExploreWorld.class
/ExploreRespond.class
/PlayerInfo.class
/BossBarInfo.class
/PlayerPoints.class
/ShopItem.class
/LocaleReader.class
/BoostMultiplier.class
/BoostCounter.class
/BoostType.class
/McmmoSkill.class
/FastPayment.class
/TempJobProgression.class
/BlockTimer.class
/BlockProtection.class
/BpDBAction.class
/DBAction.class
/Boost.class
/CurrencyType.class
/CurrencyLimit.class
/CuboidArea.class

12
src/main/java/com/gamingmesh/jobs/dao/.gitignore vendored
View File

@ -1,12 +0,0 @@
/JobsConnection.class
/JobsConnectionPool.class
/JobsDAO.class
/JobsDAOData.class
/JobsDAOH2$JobsDAOH2SQLiteImporter.class
/JobsDAOH2.class
/JobsDAOMySQL.class
/JobsDAOSQLite.class
/JobsDriver.class
/JobsDrivers.class
/JobsDAO$1.class
/JobsDAO$2.class

3
src/main/java/com/gamingmesh/jobs/hooks/MythicMobs/MythicMobs4.java
View File

@ -64,6 +64,9 @@ public class MythicMobs4 implements MythicMobInterface {
if (failed)
return "";
if (MMAPI == null)
return "";
MythicMob mm = MMAPI.getMythicMob(id);
try {
if (mm != null)

1
src/main/java/com/gamingmesh/jobs/i18n/.gitignore vendored
View File

@ -1 +0,0 @@
/Language.class

15
src/main/java/com/gamingmesh/jobs/listeners/.gitignore vendored
View File

@ -1,15 +0,0 @@
/JobsListener.class
/JobsPaymentListener.class
/McMMOlistener.class
/PistonProtectionListener.class
/VanillaListeners.class
/JobsPaymentListener$1.class
/JobsListener$1.class
/JobsPaymentListener$2.class
/MythicMobsListener.class
/JobsListener$2.class
/JobsListener$3.class
/JobsListener$4.class
/McMMOlistener$Skill.class
/MythicMobsListener2.class
/MythicMobs2Listener.class

5
src/main/java/com/gamingmesh/jobs/nmsUtil/.gitignore vendored
View File

@ -1,5 +0,0 @@
/v1_8.class
/v1_7.class
/v1_9.class
/v1_10.class
/v1_11.class

10
src/main/java/com/gamingmesh/jobs/resources/jfep/.gitignore vendored
View File

@ -1,10 +0,0 @@
/ConstantNode.class
/EvaluationException.class
/ExpressionNode.class
/FunctionNode.class
/OperatorNode.class
/ParseError.class
/Parser$Element.class
/Parser.class
/Sfun.class
/VariableNode.class

6
src/main/java/com/gamingmesh/jobs/selection/.gitignore vendored
View File

@ -1,6 +0,0 @@
/AutoSelection.class
/SchematicsManager.class
/SelectionManager$Direction.class
/SelectionManager.class
/WorldEditSelectionManager.class
/WorldGuardUtil.class

33
src/main/java/com/gamingmesh/jobs/stuff/.gitignore vendored
View File

@ -1,33 +0,0 @@
/ChatColor.class
/FileDownloader.class
/JobsClassLoader.class
/UUIDFetcher.class
/UUIDUtil.class
/UUIDConverter.class
/ActionBar.class
/GiveItem.class
/TabComplete.class
/PerformCommands.class
/TopSignStuff.class
/Gui.class
/TranslateName.class
/Debug.class
/Perm.class
/Scboard$1.class
/Scboard.class
/ScheduleUtil$1.class
/ScheduleUtil.class
/Sorting.class
/Sorting$1.class
/Sorting$2.class
/Sorting$3.class
/Sorting$4.class
/TimeUtil.class
/TimeManage.class
/Loging.class
/ScheduleUtil$2.class
/OfflinePlayerList.class
/OfflinePlayerList$1.class
/Explore.class
/BossBarManager.class
/BossBarManager$1.class

5
src/main/java/com/gamingmesh/jobs/tasks/.gitignore vendored
View File

@ -1,5 +0,0 @@
/BufferedPaymentTask.class
/BufferedPaymentThread.class
/DatabaseSaveThread.class
/DatabaseSaveThread$1.class
/BufferedPaymentThread$1.class