Commit Graph

8841 Commits

Author SHA1 Message Date
AlexTheCoder a124aa3d85 Fix items added via support server not showing up in customer service logs 2016-09-05 20:25:02 -04:00
AlexTheCoder ffb6073532 Fix unnecessary calls to mysql/mssql databases in support server 2016-09-04 23:44:54 -04:00
AlexTheCoder b5771550ad Fix titan command not being registered 2016-09-04 23:28:25 -04:00
AlexTheCoder 866c3ee7c9 Add a command to allow support agents to check for ownership of internal sales packages 2016-09-04 22:11:05 -04:00
AlexTheCoder e2d3763ec0 Add an enjin chargeback command and fix punishing in support servers 2016-09-03 15:42:32 -04:00
AlexTheCoder 3088d79cf5 Update support packages 2016-09-03 15:16:59 -04:00
AlexTheCoder 09a535466a Fix clan banner being removed from support server information 2016-09-03 11:37:45 -04:00
AlexTheCoder aabde6ba90 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes 2016-09-03 11:35:57 -04:00
Shaun Bennett e57d009341 Remove unused import! 2016-09-03 01:11:50 -04:00
Shaun Bennett 586a768c7b Fix enjin listener else bug 2016-09-03 00:59:15 -04:00
Shaun Bennett 17409d0bd2 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
2016-09-03 00:57:22 -04:00
Shaun Bennett 0ea1d3eca2 Fix enjin listener else bug 2016-09-03 00:56:36 -04:00
cnr c9358d8c5a Add power play to support server 2016-09-02 19:10:30 -05:00
cnr 2bce540c5d Disable Antihack in the staff server 2016-09-02 02:51:34 -05:00
cnr 374142e63f Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:42:51 -05:00
TadahTech e2f974e1e6 Add sounds and messages to basketball. 2016-09-02 00:40:23 -05:00
cnr ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
AlexTheCoder 9abbe1bfb9 Update support whitelist and op list 2016-09-02 00:10:36 -05:00
cnr f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr 71b880793f Implement power play logging and initial rewards 2016-09-02 00:01:49 -05:00
AlexTheCoder 22ddacd21b Update support whitelist and op list 2016-09-01 23:01:34 -04:00
TadahTech 9e0bb6ff96 Tweak invite starting index.
Disable NextBestGame in an MPS
2016-09-01 20:59:28 -05:00
TadahTech d8486abbfd Fix minor best game issues. 2016-09-01 20:05:53 -05:00
TadahTech a6360249b7 Use party if a player has it. 2016-09-01 08:47:43 -05:00
TadahTech 6f3d7dcd29 Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have 2016-09-01 08:45:43 -05:00
TadahTech 41936e0efc Remove users from the map. 2016-09-01 08:31:16 -05:00
TadahTech fdc54e1dd1 Fix BestGame not cancelling for parties. 2016-09-01 08:29:51 -05:00
cnr 05f640266f Fix basketball scoring infinite loop 2016-09-01 06:36:47 -05:00
TadahTech 107a296239 Fuck you intellij 2016-09-01 05:49:59 -05:00
TadahTech 53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech 9fcee07427 Fix people getting stuck in chests. 2016-09-01 05:34:37 -05:00
TadahTech 68743cf73c Mavs changes. 2016-09-01 03:24:38 -05:00
TadahTech 46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
TadahTech c0c75ea375 Allow team selecting to work on the mavs hub. 2016-08-31 23:46:29 -05:00
cnr 9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
cnr 55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
LCastr0 8e8719070c Changes Omega Chest to not be craftable
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
2016-08-31 23:26:41 -03:00
AlexTheCoder 8397f53d39 Remove unneeded teleportation in clans hubs 2016-08-30 03:27:11 -04:00
AlexTheCoder ba02dea404 Fix me being dumb 2016-08-30 03:22:55 -04:00
TadahTech 90ce21db3d Update preferences 2016-08-30 00:51:51 -05:00
AlexTheCoder 8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
TadahTech a68f7395e4 Use proper server group / remove testing. 2016-08-30 00:10:38 -05:00
AlexTheCoder 5108a6f08d Convert to npc for entering mavericks lobby 2016-08-30 01:02:26 -04:00
AlexTheCoder d7d8ef021e Disable using cosmetics inside mavericks hub 2016-08-30 00:47:48 -04:00
TadahTech 94bfc9aa15 Use proper server group / remove testing. 2016-08-29 22:33:01 -05:00
TadahTech dfced7186f Finish tweaks for the hub 2016-08-29 22:32:07 -05:00
AlexTheCoder 463c03e9d1 Add pitch and yaw to npcs 2016-08-29 22:11:53 -04:00
Shaun Bennett f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett e7d876e865 Fix string.format param order 2016-08-29 21:33:00 -04:00
TadahTech 39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00