Commit Graph

8327 Commits

Author SHA1 Message Date
Keir Nellyer 2a167745a6 Update chatsnap url 2016-07-26 16:51:59 +01:00
Keir Nellyer 369246f635 Fix out of bounds statement parameter caused by earlier removal of report preferences 2016-07-21 23:11:48 +01:00
Keir Nellyer c5f3f2b2d6 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 22:44:43 +01:00
Shaun Bennett 9ed0bbe43a Fix NPC's for unloaded worlds 2016-07-21 14:22:38 -05:00
xXVevzZXx 0262452b6a Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable. 2016-07-21 13:59:35 -05:00
Keir Nellyer 9b58c53e90 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 16:11:09 +01:00
TadahTech b48f97fd2e Fix stupid JOOQ issue and IntelliJ. 2016-07-21 03:46:18 -05:00
TadahTech b734dc4e87 Remove Pay wall for Party sizes 2016-07-21 02:59:15 -05:00
TadahTech 9f0f4e0018 Fix possible cross server invite spamming. 2016-07-21 02:20:02 -05:00
TadahTech f1b3c4756d Use UUID's instead of playernames. 2016-07-21 02:16:26 -05:00
TadahTech 4cab91f251 Use getPlayerExact. 2016-07-21 02:05:37 -05:00
TadahTech 76ac89266e -sigh- a hotfix.
Won't invite players across servers who are already in parties.
Fix transferring ownership to non-party members
2016-07-21 02:05:10 -05:00
cnr e7da161f35 Revert "Fixed PC-706"
This reverts commit 96d16be5b7.
2016-07-20 20:07:06 -05:00
cnr b0f5b536b1 Merge branch 'feature/party-v2' into develop 2016-07-20 18:06:14 -05:00
Shaun Bennett 31d6a2542d Replace runSync call with runAsync 2016-07-20 18:03:01 -05:00
Shaun Bennett b136372d1b Gem fountain changes; increase goal, link to eu 2016-07-20 18:03:01 -05:00
TadahTech c3b7a81730 Don't show all buttons in all menus. Protected fields != private fields. 2016-07-20 17:48:24 -05:00
cnr 9a06cce0a0 Merge branch 'feature/party-v2' into develop 2016-07-20 16:41:50 -05:00
TadahTech 0fc64c45a8 Update JoinResponseReason 2016-07-20 16:33:26 -05:00
TadahTech 96261c1a6d Party PR Updates. 2016-07-20 16:18:49 -05:00
TadahTech 67a185acc9 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-20 15:52:59 -05:00
Keir Nellyer 1ca7519963 Make index preservation faster 2016-07-20 13:19:21 +01:00
Keir Nellyer 85c1bc1728 Ensure returned list really is in the original order 2016-07-20 13:08:33 +01:00
TadahTech 136eb078ef PC-426: Update UX for non-premium players:
Removes the in game advertisement display when selecting servers.
Removes all chat throttling.
Adds a message sent on join to the player, promoting the newest sale or promotion.
2016-07-20 06:59:37 -05:00
Keir Nellyer a78c71793a Made filter method return results in the same order they were entered and generally improved method code 2016-07-20 12:46:10 +01:00
Keir Nellyer 48f9085c79 Small changes to report close functionality 2016-07-20 11:58:09 +01:00
Keir Nellyer 856f91da24 Update close report command syntax 2016-07-20 10:40:42 +01:00
Keir Nellyer 5c3f78b428 Fix query used to fetch report(s) account is handling 2016-07-20 10:40:03 +01:00
Keir Nellyer 80f0113183 Fix commands out of sync error by storing the result of the query 2016-07-19 17:56:27 +01:00
Keir Nellyer fccc1834a5 Rewrite view.php to work without MySQL native driver 2016-07-19 17:31:46 +01:00
Keir Nellyer 1c1825710d Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2 2016-07-19 16:38:19 +01:00
Keir Nellyer 37a06816dd Modify /reportclose to no longer require a report id parameter 2016-07-19 16:37:53 +01:00
TadahTech c32e647d9e Add private messaging system 2016-07-18 22:21:09 -05:00
TadahTech ce4289fa00 Don't do weather. 2016-07-18 22:13:32 -05:00
TadahTech c8075b2b47 Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2 2016-07-18 19:04:26 -05:00
TadahTech b4aa303923 Bug fixes. 2016-07-18 19:04:02 -05:00
TadahTech 36f2873e15 Map Parser update. 2016-07-18 19:00:11 -05:00
Keir Nellyer d9240e1589 Invalid PHPDoc made me write bad code :P 2016-07-18 19:29:05 +01:00
Keir Nellyer ca835bb4c6 Remove all try...finally clauses as they aren't supported in PHP 5.4 2016-07-18 19:08:37 +01:00
Keir Nellyer 976e8788b7 Update report message if a player reports another player multiple times 2016-07-18 18:37:21 +01:00
Keir Nellyer 103f31afc1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-18 17:17:11 +01:00
Keir Nellyer 17c7f36b04 Fix getInvolvedUsers not getting reporters 2016-07-18 14:37:23 +01:00
Keir Nellyer c89b35f2f1 Remove redundant categories array 2016-07-18 14:36:21 +01:00
xXVevzZXx 370b0693d9 fix the server thinking it's the next week 2016-07-17 05:20:21 -05:00
cnr 0ae4b0c5e0 Temporarily disable anti-xray in UHC 2016-07-16 23:08:18 -05:00
Shaun Bennett 34f718b2ec Fix improper gem/shard reward handling 2016-07-16 06:27:16 -05:00
Keir Nellyer 6756d04aa7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-15 23:56:08 +01:00
Keir Nellyer 3a8722a1a2 Remove redundant files and variables 2016-07-15 23:54:20 +01:00
Keir Nellyer 0d9aad37f9 Optimise imports 2016-07-15 16:31:25 +01:00
xXVevzZXx 728a91da0f adding damage outsid ethe loop 2016-07-15 04:57:44 +02:00