9d6985ddcd
Fix MPS zip file name, null amp stand
2016-09-29 09:10:25 -04:00
620e219b14
Change MPS world zip ( #219 )
...
* Change MPS map name
2016-09-28 21:32:51 -04:00
b27e1ffbd1
Reward shards on thank claim instead of when being thanked
2016-09-28 21:28:07 -04:00
3ede0e5644
Merge Report System v2 ( #216 )
...
Report system (v2)
2016-09-28 17:39:26 -04:00
3d7647b26b
Game Lobby Update ( #215 )
...
* Game Lobby update. Phase 1.
* Correctly apply kit data to players who use the next best game feature.
* I can do integer comparisons, I promise.
* So much stuff, all minor.
* Suck it Carl.
* Fix Party bug.
Update LobbyManager
* Allow QA to test KitProgression @shaun cherry pick this plz.
* Proper generation check (testing)
Remove debugging from NextBestGame
* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.
* ClansHub and Tweaks to the lobby manager
* WA Tweak.
2016-09-28 10:17:05 -04:00
31dcc87385
Slight code cleanup
2016-09-28 10:51:55 +01:00
f8ad302d80
Simplify handling of optional reason
2016-09-28 10:41:56 +01:00
6f77c05f1e
Players should still be report banned if they reach abuse threshold
...
even if reportCloser is not present
Also alert players of report closing regardless of whether
reportCloser is present
2016-09-28 10:40:39 +01:00
84e1a7291b
Report result gui should handle messaging of player invoking team
...
assignment
2016-09-28 10:35:49 +01:00
e54f70d194
JavaDocs for abortReport and assignTeam methods
2016-09-28 10:31:54 +01:00
1543b539ba
Refactor unbox optional collection to utility class
2016-09-26 11:01:27 +01:00
f42681c390
Remove old todo
2016-09-26 10:33:46 +01:00
f63561b05e
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-26 10:19:13 +01:00
125428d09e
Make getReport return Optional as it is quite likely that this will
...
return null
2016-09-26 10:02:30 +01:00
b35d933e56
Fix PlayWire error, handle future errors properly
2016-09-25 16:28:02 -04:00
32385d4064
Update error message for non-titans, due to change made in previous commit
2016-09-25 02:28:42 +01:00
a413df9f52
Limit feature to titans for damage limitation
2016-09-25 02:01:10 +01:00
1475243d8a
Added MetalMan to the GUI for testings
2016-09-23 23:14:10 -03:00
187c6ec67c
Remove debug messages
2016-09-22 21:25:40 -04:00
548e23a212
Fix fetching timestamp from wrong column
2016-09-22 21:21:16 -04:00
b24429783b
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
df17177892
PC-1003 Forgot to commit some changes from last commit
2016-09-22 16:10:31 +01:00
ea74826d0c
PC-1003 Prevent rogue Report objects being cached and cause handler message spam
2016-09-22 16:01:11 +01:00
6494720d2e
PC-998 Limit chat messages to 3 minutes
2016-09-22 15:48:01 +01:00
79e6903c8b
Enable Speed and Glide punishments, remove hack from ban reason
2016-09-22 08:44:58 -04:00
a3d210871d
Add ignored checks to GWEN ( #211 )
2016-09-21 23:21:02 -04:00
9be26a92d1
Remove NCP
2016-09-21 22:21:49 -04:00
ac967f6b18
OITQP no longer in Beta ( #210 )
...
* Convert OITQP into a module based system.
* More magic modules
* Achievements and Stats
* Achievement menu update
* Removed some Util methods I added that were never used.
* Missed a few things
* To Alex, Love Sam
* Gem and achievement kits
2016-09-21 22:05:21 -04:00
c1c46aceb8
Skyfall Game( #208 )
...
* basic prototype of the game Skyfall
* new crumble mechanic
* Developing basic game with basic mechanics and basic kits.
* Fix merge issues
* Add Supply Grop and Deathmatch and change map crumbling
* Make cosmetical changes for QA and add Stat Trackers and Achievements
* Add version requirement
* Change scoreboard layout
* Dont crumble the first island, but the islands over the spawn points
* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava
* Unused imports
* Fix kit description, modify island crumbling and add ring damage
* Revert to normal crumble values
* Add Javadoc
* Remove more unused imports
* Check for material data on ring generation
* Add Block effect for Booster Ring recharge
* Unused imports...
* Add Elytra removal message and countdown
* "Fix" food issues and some other minor things
* Add chest refill to scoreboard from beginning
* Fix supply drop
* Unused imports.....
* Re-enable Anti Cheat
* Add java doc, remove system messages and add exeptions
* The end of the great label debate
* Fix method naming conventions
* Remove more labels
* Disable Booster kit
2016-09-21 21:57:38 -04:00
7252906d30
Better synchronization of Managers
2016-09-21 21:37:57 -04:00
92a0d606d4
Fix timings
2016-09-21 21:37:57 -04:00
ec4add259d
Teleport players back to center of arcade lobby
2016-09-21 21:37:57 -04:00
bf61296948
PlayWire Ad integration ( #207 )
...
* PlayWire integration.
* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*
* PlayWire stuff.
* PlayWire streaks and tweaks.
2016-09-21 21:24:58 -04:00
1eecfbafee
Small code improvement
2016-09-21 16:33:05 +01:00
c6eb23812f
PC-1001 Do not show private messages between users unless reporter is
...
involved
2016-09-21 13:21:23 +01:00
09287ddefc
PC-1002 Automatic reports bans show the id of the report which caused
...
the ban
2016-09-21 12:22:55 +01:00
e73b06b5ab
PC-998 Change cache time for chat messages to 5 minutes
2016-09-21 11:46:03 +01:00
32563904fa
PC-997 Show total counts when showing report statistics
2016-09-19 10:38:03 +01:00
f0c7b1d6aa
Whoops, forgot this
2016-09-18 16:18:33 -03:00
537dc28daa
Used proper method to add specific prizes
2016-09-18 16:16:57 -03:00
ae6868b76a
Added Witch Morph
...
Added Metal Man morph
2016-09-16 20:46:52 -03:00
2cdab061b6
PC-886 Move report bans over to punishment gui
2016-09-16 17:40:14 +01:00
ebe212c8ff
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-15 17:30:27 +01:00
199d6cba3e
Add a period to the anticheat ban message. ( #206 )
2016-09-14 20:50:08 -04:00
da5a8d5b46
PC-966 Reports assigned to RC now have a higher priority instead of no decay effect
2016-09-14 21:51:06 +01:00
a64ba4db2a
Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report
2016-09-14 21:44:57 +01:00
9af606ae20
Ensure suspect messages actually involved the reporter
2016-09-14 14:53:39 +01:00
efe532e8a6
Clean-up createReport method
2016-09-14 14:37:44 +01:00
464099dc87
Correctly handle weird cases whereby an account may be involved in
...
multiple open reports of the same category
2016-09-14 14:26:12 +01:00
2be0522599
Attach JavaDocs and small method renames
2016-09-14 14:14:11 +01:00
425d814ac4
PC-966 When selecting a new report for a user to handle, always
...
prioritise reports assigned to teams that the user is a member of
2016-09-14 12:14:14 +01:00
5ad4f2831d
PC-966 Only allow members of team to handle report if team assigned
...
to report
2016-09-14 12:13:41 +01:00
20c4488c5f
PC-966 Add gui button for passing report to RC team
...
Misc. other changes
2016-09-13 18:28:09 +01:00
d115097eb9
PC-966 Implement support for teams to be assigned to a report
2016-09-13 17:01:47 +01:00
f1d1585585
PC-966 Implement method to get members of a team
2016-09-12 18:13:10 +01:00
ee6e8a9656
PC-966 Implement report user cache
2016-09-12 18:07:01 +01:00
a39d894d85
PC-966 Add support for saving report teams to database
2016-09-12 17:54:00 +01:00
fae7e93f1a
PC-966 Add support for loading report teams from database
2016-09-12 17:08:11 +01:00
a5e5be4329
PC-951 Fix handler message task not being cancelled when closing report
2016-09-12 11:56:21 +01:00
5e5cb3284a
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-12 10:11:31 +01:00
6de3640243
Disable immediate ban actions for Glide and Speed
2016-09-11 17:54:50 -05:00
36ce7ef222
Fixes for the Omega chest giving duplicated items ( #202 )
2016-09-10 23:05:29 -04:00
454e1c8c11
AntiCheat 1.2 ( #200 )
...
* Implement Anticheat 1.2 hooks
* Add default check thresholds for unknown check types
* Add violation level support for new checks
* Add ban waves for KillAura type D
* Amend DELETE_PENDING now that it's not hardcoded
* Add instant bans for high VL Glide/Speed
* Don't specify hack type in banwave ban message
2016-09-10 23:01:13 -04:00
f6b06c63ac
Fixes for the Omega chest giving duplicated items
2016-09-10 00:43:08 -03:00
e12ed35da1
Fix NPE and kit upgrades issue
2016-09-07 23:13:28 -04:00
9318ba4de2
Merge branch 'develop' into bugfix/samczsun
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
2016-09-07 20:12:57 -04:00
7fbd6087eb
Merge pull request #187 from Mineplex-LLC/update/oitq
...
Skywars Update Patch
2016-09-07 20:08:08 -04:00
7b6f0ae221
PC-953 Make report ids in /reportstats command clickable
2016-09-07 16:40:05 +01:00
bed563876a
Add a comment to explain usage of KitUpgradeShop
2016-09-07 14:18:07 +01:00
b1b9900c9e
Add offline stat checking
2016-09-07 07:47:19 -04:00
e2840f36b5
PC-958 Don't allow chat abuse reports of players who haven't spoken
...
in chat
2016-09-07 11:28:20 +01:00
640a8d3516
PC-958 Allow reporting of offline players
2016-09-07 09:50:10 +01:00
225583a13d
Remove join restrictions on beta servers from unranked players
2016-09-06 21:36:30 -04:00
353cdb2413
Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2
2016-09-06 17:28:03 +01:00
b1b275fc67
PC-958 Prepare codebase for reporting of offline players
2016-09-06 17:27:48 +01:00
94b5a6e760
PC-952 Add /reportinfo
2016-09-06 16:43:51 +01:00
444fe5d151
Remove hacky reflection method to get server name
2016-09-05 18:37:17 -04:00
6490ab3786
Don't hide banwave animation from staff
2016-09-05 18:25:16 -04:00
6b1d551a37
Remove please investigate
2016-09-05 18:25:16 -04:00
0678f7287d
No fake levels for those who don't want it
2016-09-05 18:25:16 -04:00
d09b27bfe1
Fix disguises prevent join, join rank check bugs
2016-09-05 18:25:16 -04:00
c18d771715
Unbreak Squid in SSM
2016-09-05 18:25:16 -04:00
12130d41e6
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-05 17:59:51 +01:00
acd63c90a1
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
29bb2a3895
Add an enjin chargeback command and fix punishing in support servers
2016-09-04 00:39:44 -05:00
b3212fc003
Particle changes
2016-09-03 20:13:08 +01:00
4b1c93150b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-03 20:12:39 +01:00
8d5d0c6272
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-03 18:29:37 +01:00
c3c61b8189
Merge fix
2016-09-03 18:29:18 +01:00
c9358d8c5a
Add power play to support server
2016-09-02 19:10:30 -05:00
a5efacc12f
PC-955 Fix closing gui showing incorrect suspect name
2016-09-02 14:31:38 +01:00
ae0d30558c
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:12:12 -05:00
f6db5393a3
Merge branch 'project-cosmetics' into develop
2016-09-02 00:08:23 -05:00
71b880793f
Implement power play logging and initial rewards
2016-09-02 00:01:49 -05:00
9e0bb6ff96
Tweak invite starting index.
...
Disable NextBestGame in an MPS
2016-09-01 20:59:28 -05:00
78048ac279
PC-947 Add bypass for handling reports created or made against for developer
2016-09-01 18:21:50 +01:00
d39dae748c
PC-947 Don't allow staff members to handle reports created by or made against them
2016-09-01 17:55:36 +01:00
9fcee07427
Fix people getting stuck in chests.
2016-09-01 05:34:37 -05:00
9cd5b73432
Merge branch 'update/basketball-game' into develop
2016-08-31 23:19:51 -05:00
55086efd91
Merge branch 'feature/shadowmute' into develop
2016-08-31 23:16:57 -05:00
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
725892e93b
PC-957 Show warning message when a user's report is marked as abusive
2016-08-31 16:38:35 +01:00
8f28ab3f0d
PC-949 /reportclose argument "<conclusion>" should be "<reason>"
2016-08-31 16:30:55 +01:00
97e06053d1
PC-948 Don't send handler to server if they are already connected to it
2016-08-31 16:25:14 +01:00
04432d44d7
This can be an in-line return
2016-08-31 15:04:15 +01:00
a7d224b7e4
Fix reports duplicating themselves and causing massive issues
2016-08-30 23:18:12 +01:00
96b74444e5
Fix duplicate message entries
2016-08-30 22:54:58 +01:00
ba02dea404
Fix me being dumb
2016-08-30 03:22:55 -04:00
90ce21db3d
Update preferences
2016-08-30 00:51:51 -05:00
8ca214a4d8
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-08-30 01:37:14 -04:00
a68f7395e4
Use proper server group / remove testing.
2016-08-30 00:10:38 -05:00
dfced7186f
Finish tweaks for the hub
2016-08-29 22:32:07 -05:00
463c03e9d1
Add pitch and yaw to npcs
2016-08-29 22:11:53 -04:00
f72647e1d4
Merge with develop
2016-08-29 21:56:03 -04:00
e7d876e865
Fix string.format param order
2016-08-29 21:33:00 -04:00
39ea280098
NextBestGame code and new hub releases
2016-08-29 20:21:36 -05:00
3687c7ad98
PowerPlayClub update
2016-08-29 21:32:11 -03:00
f3e38031ab
Add shadowmuting
2016-08-29 18:57:07 -04:00
9454e1f409
Skywars and Kit Progression
2016-08-29 23:07:48 +01:00
022e9f6bd4
Players can have more than 1 active report open against them
2016-08-27 22:38:54 +01:00
3f18c0cc6b
Fix join/leave report handling
2016-08-27 22:35:12 +01:00
cd9423a8e4
De-couple chatsnap from report system
2016-08-27 22:21:56 +01:00
a35c162dc4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-26 21:26:16 +01:00
efc14ee13f
Another merge fix
2016-08-26 21:26:14 +01:00
3e38eb5990
Fixes to the merging conflicts
2016-08-25 20:13:59 -03:00
25d64c6dee
Changes to lock command
2016-08-25 20:12:00 -03:00
b3b8f44b3a
Fix perks not being registered.
2016-08-25 05:11:52 -05:00
ebfd00ebc3
Fix centering of the Preference Menu
2016-08-25 04:04:53 -05:00
41b40fa12c
Fix painting breaking.
2016-08-25 03:54:10 -05:00
77e0090531
Tweak preferences
2016-08-25 00:17:31 -05:00
1654850e8c
Final Changes
2016-08-24 22:26:38 -05:00
ba2bee4f25
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
bca19788db
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
df1fc60d3d
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:12:58 -05:00
469a72afc0
JavaDocs
2016-08-23 16:40:25 +01:00
c9d14dc522
Update clans to new preferences. Remove debug messages.
2016-08-23 03:12:36 -05:00
bbe44e7d75
Remove debug.
2016-08-23 02:04:07 -05:00
02f703e68e
Remove debug.
2016-08-23 01:57:39 -05:00
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
2c37d17db3
Slight code change
2016-08-22 19:42:30 +01:00
dcfeaab5e1
Show invalid usage with alias used
2016-08-22 16:48:59 +01:00
fb369d3df9
Add command to unban player from report system
2016-08-22 16:36:42 +01:00
f805ceccdc
Don't include aborted reports in report statistics
2016-08-22 16:07:14 +01:00
7fb6ff58d0
Moved gadgets to use a whitelist system instead of blacklist for
...
collisions
2016-08-22 01:00:29 +02:00
e64324b36c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-20 11:40:15 +02:00
bde51e6a54
The server of the handler now handles sending periodic message, instead of it being done through Redis
...
This also fixes server restarts breaking handler messages.
2016-08-19 18:08:36 +01:00
dc5c2430cd
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-19 17:58:27 +01:00
d05a69ac69
Fix handler message disappearing when changing server
2016-08-19 17:27:05 +01:00
6367321315
Fix weird colouring
2016-08-19 17:26:08 +01:00
eabaa1e68a
Move limit statistic limit to query and sort returned results
2016-08-19 17:01:26 +01:00
834e6b5fdf
Switch to using UtilPlayer.message
2016-08-19 16:48:05 +01:00
26aff936a0
Rename /reportstat command to /reportstats
2016-08-19 16:46:49 +01:00
779efe3f47
Improve display of /reportstat
2016-08-19 16:46:25 +01:00
bbb40a7b6e
A report is considered expired once it's priority is < 1
2016-08-19 16:23:19 +01:00
b6f0e84a02
Fix sql error when attempting to reinsert same report mapping
2016-08-19 16:21:44 +01:00
2a62abfd33
Push chat snapshots at save time instead of handle time
2016-08-19 16:07:06 +01:00
a1a604757b
Remove old todo
2016-08-19 15:48:02 +01:00
5b685a3a86
Fixed query for getting unhandled reports to behave well with abused reports
2016-08-19 15:46:59 +01:00
2211e6c4ef
Fix query for getting reports a user is handling to ignore aborted reports
2016-08-19 15:03:54 +01:00
514757924d
More descriptive message when aborting a report
2016-08-19 14:31:15 +01:00
373c82c11b
Fix query for getting unhandled reports
2016-08-19 14:30:59 +01:00
ee78cf2bb9
Cancel messaging task if handler is no longer present
2016-08-19 14:30:24 +01:00
10a6cbfe3b
Remove handler from report object when aborting a report
2016-08-19 14:29:15 +01:00
24d4da6aa2
Fix query to fetch report not fetching reports with no handler
2016-08-19 14:19:52 +01:00
e6609d59c9
Fix incorrect MySQL operator
2016-08-19 14:01:17 +01:00
c4cb5d8db4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-19 12:56:24 +01:00
84c6720d1c
Fix merging errors
2016-08-18 18:30:32 -03:00
f4175ed724
Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D
2016-08-18 18:07:32 -03:00
b4ae149d89
Handlers can now abort a report allowing it to be handled by another
...
member of staff
2016-08-18 14:42:53 +01:00
a79fa9cd46
Update GWEN preference name to reflect its purpose
2016-08-18 01:59:31 -05:00
08e1b765f7
Send local Anticheat messages regardless of preference
2016-08-18 01:59:31 -05:00
78fe41a8af
Update Anticheat ban message and duration
2016-08-18 01:59:30 -05:00
999237fe69
Accurately report game TPS
2016-08-18 01:59:05 -05:00
405f67f8b2
Implement/activate Anticheat phase two
...
- Remove anticheat guardians from Arcade
- Uncomment/implement Anticheat phase two actions
- Specifically: immediate ban on Kill Aura type A, VL 200.
- Give moderators less-specific messages, and limit messages by severity
2016-08-17 23:23:20 -04:00
69275cb79c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-17 20:57:18 +02:00
3126d540e7
/reportstat command progress
2016-08-16 21:30:37 +01:00
0176f31f1e
Complete implementation of kit progression
2016-08-16 18:55:26 +01:00
3760166599
Remove remnants of old user report preference
2016-08-16 14:13:01 +01:00
29a07c60ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-16 11:02:15 +01:00
6839006bd1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-15 20:25:01 +01:00
08e65cb17e
Implement MineplexLink spectator check
2016-08-14 17:40:28 -04:00
6e32906805
More Gadget Collision patches
2016-08-14 22:50:48 +02:00
045445791a
Fixed gadget collision checks
2016-08-14 21:06:28 +02:00
e71cec874e
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-14 20:09:01 +02:00
8f4303cf39
Progress on Upgrade Details
2016-08-13 22:40:33 +01:00
0f4f1a3582
Remove pointless try/catch
2016-08-13 01:39:56 -05:00
c99a23d670
Add region and server to chat payload
2016-08-13 00:57:39 -05:00
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05:00
a8e891f247
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
4562b00dcb
Repurpose MAC reports pref for GWEN reports
2016-08-11 04:01:14 -04:00
7b1ac5ded2
Merge branch 'update/clans' into develop
2016-08-10 21:27:43 -04:00
7de9da3d1c
Complete rework of disguising and antihack hook
...
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.
Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.
Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines
The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
e05f90372a
Add kit upgrade details
2016-08-10 19:05:40 +01:00
ff7a427787
Handle party chat correctly
2016-08-10 16:57:44 +01:00
cbdce80483
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-08-10 16:01:47 +01:00
907ac7473f
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-10 16:52:37 +02:00
2f3ff052ff
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-08 22:59:55 +01:00
4c825cf80b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-08 22:48:33 +01:00
4180f03a52
Use the correct SalesPackageBase for gadgets
2016-08-07 22:40:26 -04:00
95302177f8
Add cooldowns to all gui items tied to giving rewards to prevent some exploitation
2016-08-07 14:47:14 -04:00
4e0971ab0a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-08-05 14:35:57 -04:00
bf7065732b
Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have
2016-08-05 13:34:04 -04:00
1854b71757
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
0ca4fe2d38
Disable MAC kick for suspicious movement
2016-08-04 12:41:59 -04:00
3610f78b37
Merge branch 'feature/thanks' into develop
2016-08-03 22:23:46 -04:00
85c4c181ec
Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl
2016-08-03 18:22:36 -05:00
e113bedea5
Fix accidentally refactoring "thanks" in strings
2016-08-03 15:11:31 -05:00
72f078fe54
Fix using wrong name, add missing jooq files
2016-08-03 15:04:06 -05:00
6d93efc1a2
Adjust button text as well
2016-08-03 14:57:30 -05:00
ad6c1dd970
Adjust some text wording
2016-08-03 14:55:33 -05:00
2e80838376
Update ClaimTips lore
2016-08-03 14:25:07 -05:00
1ae7f6cb25
Integrate the new ThankManager into Amplifiers
2016-08-03 14:03:12 -05:00
3f0938815d
Merge branch 'update/clans' into develop
2016-08-03 12:39:52 -04:00
2b8754aa32
Metal Kit bug fixes
2016-08-02 23:34:12 +01:00
c327309a65
Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future
2016-08-02 16:46:14 +01:00
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
bd00ac8446
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-01 19:34:40 +01:00
2c37af32ca
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-01 19:19:34 +01:00
d12d353c20
Fix pronoun in message autoreply
2016-07-30 17:36:03 -04:00
635e07c5a2
This wasn't meant to be included in the last commit
2016-07-29 15:09:21 +01:00
bb9dbf1da4
PC-877 Vanish report handler when teleporting to offender's server
2016-07-29 15:08:03 +01:00
806ec2460a
Add Gameplay report category for gameplay related reports
2016-07-29 13:20:06 +01:00
43c94e95b3
PC-875 Players should only be banned after 3 abusive reports (currently is set to 1)
2016-07-29 12:58:08 +01:00
9c76fec54e
PC-874 Show label for report closure reason when closing a report
2016-07-29 12:56:14 +01:00
d853f8467c
Merge branch 'update/clans' into develop
2016-07-28 22:56:23 -05:00
9529789159
Remove 3 second chat delay.
2016-07-28 22:54:04 -05:00
47d79bbad5
Fix bugs arising during clans release
2016-07-28 19:08:47 -04:00
ab8d6daa2c
GitHub being annoying again
2016-07-28 19:59:49 -03:00
ab52965e44
Power Play button inside Carl, and the power play manager
2016-07-28 18:07:10 -03:00
5dd35d45c4
PC-873 Alert user regardless of usage if banned from using /report
2016-07-28 17:41:20 +01:00
8ee6ab6a1b
Display message to reporters of a report when it is closed
2016-07-28 17:17:12 +01:00
ab9bf2f405
Fixes possible bug with party leaders not seeing chat.
...
Adds pling when you received an invite.
2016-07-28 03:40:24 -05:00
dd38a1dd76
Merge branch 'update/clans' into develop
2016-07-27 20:40:35 -05:00
05e59ae9cc
Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
...
This reverts commit 917b83250d
2016-07-27 19:03:04 -05:00
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
8648581140
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-27 19:57:25 +01:00
ee38cb4c39
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-27 19:56:36 +01:00
167c0f2b5e
Reimplement EnergyShopButton with new machinery
2016-07-27 13:52:03 -05:00
3cddf35d12
Refactor out legacy ConfirmationPage
2016-07-27 13:52:03 -05:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
dc96258055
Merge branch 'feature/party-v2' into develop
2016-07-27 13:19:25 -05:00
0d46bc4609
Add Amplifier thank button
2016-07-27 13:17:36 -05:00
97d72e97e4
Variable refactorings for consistency
2016-07-27 16:09:38 +01:00
f2435c3b43
Packet class refactorings
2016-07-27 16:08:23 +01:00
d474139220
Don't show Punish GUI unless report result is ACCEPTED
2016-07-27 15:46:54 +01:00
63917297ef
Show /report and /reportclose command usage when attempting to use the command incorrectly
2016-07-27 15:45:12 +01:00
72b5507390
Fixed PC-120
2016-07-27 12:29:07 +02:00
157c969e8d
Completely prevent players in parties from joining Clans servers
2016-07-27 05:51:49 -04:00
2a167745a6
Update chatsnap url
2016-07-26 16:51:59 +01:00
a1fd021f8d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-25 10:59:38 -04:00
979bb92034
Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration
2016-07-25 10:57:15 -04:00
25b0ae5916
Add support for sending players back to any clans hub via portal
2016-07-25 10:56:30 -04:00
a23c2c4e1c
Update UI to reflect allowing upgrades to be shown, per kit.
2016-07-24 16:05:19 -05:00
76da92f42e
QuiverPayload added
...
Basic implementation added
2016-07-24 21:27:31 +01:00
f4c40c61bb
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-24 13:18:53 -03:00
195a82f78f
Github is annoying me about this, but I don't know what it is
2016-07-24 13:18:33 -03:00
0dce530438
PowerPlayClub managers and stuff
2016-07-24 13:15:32 -03:00
a8503d2fb8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-24 11:50:48 +01:00
ceccf2d2ac
Don't give the item when a game is in progress.
2016-07-23 22:36:53 -05:00
133376fb94
Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full.
2016-07-23 19:50:57 -05:00
50de769e36
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-24 00:13:13 +01:00
818ed4c9a9
Set up clans monetization features in the shop and fix some hardcoded names in core
2016-07-22 00:18:34 -04:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
369246f635
Fix out of bounds statement parameter caused by earlier removal of report preferences
2016-07-21 23:11:48 +01:00
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
75cc75f40c
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 17:25:15 -04:00
2b8930eee8
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-21 15:32:49 -05:00
d7c5184980
Party fixes and tweaks.
2016-07-21 15:24:48 -05:00
fc3ceddf4d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-07-21 15:47:59 -04:00
9ed0bbe43a
Fix NPC's for unloaded worlds
2016-07-21 14:22:38 -05:00
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
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
faece2c5f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-21 11:13:15 +01:00
f48009d9f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-21 11:12:23 +01:00
e7658b4bf2
New kits and upgrades for old kits
2016-07-21 11:05:21 +01:00
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
b48f97fd2e
Fix stupid JOOQ issue and IntelliJ.
2016-07-21 03:46:18 -05:00
b734dc4e87
Remove Pay wall for Party sizes
2016-07-21 02:59:15 -05:00
9f0f4e0018
Fix possible cross server invite spamming.
2016-07-21 02:20:02 -05:00
f1b3c4756d
Use UUID's instead of playernames.
2016-07-21 02:16:26 -05:00
4cab91f251
Use getPlayerExact.
2016-07-21 02:05:37 -05:00
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
b0f5b536b1
Merge branch 'feature/party-v2' into develop
2016-07-20 18:06:14 -05:00
31d6a2542d
Replace runSync call with runAsync
2016-07-20 18:03:01 -05:00
b136372d1b
Gem fountain changes; increase goal, link to eu
2016-07-20 18:03:01 -05:00
c3b7a81730
Don't show all buttons in all menus. Protected fields != private fields.
2016-07-20 17:48:24 -05:00
0fc64c45a8
Update JoinResponseReason
2016-07-20 16:33:26 -05:00
96261c1a6d
Party PR Updates.
2016-07-20 16:18:49 -05:00
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
48f9085c79
Small changes to report close functionality
2016-07-20 11:58:09 +01:00
856f91da24
Update close report command syntax
2016-07-20 10:40:42 +01:00
5c3f78b428
Fix query used to fetch report(s) account is handling
2016-07-20 10:40:03 +01:00
d53a917627
getAbilityDetails using map and list interface
...
Changes so it uses the interface rather than the concrete class.
2016-07-19 22:38:32 +01:00
37a06816dd
Modify /reportclose to no longer require a report id parameter
2016-07-19 16:37:53 +01:00
c8075b2b47
Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2
2016-07-18 19:04:26 -05:00
b4aa303923
Bug fixes.
2016-07-18 19:04:02 -05:00
5ecfaef413
Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-07-18 16:28:22 -04:00
976e8788b7
Update report message if a player reports another player multiple times
2016-07-18 18:37:21 +01:00
7c300acaa3
No particles for vanished players!
2016-07-16 20:00:21 -03:00
f012e8d4ed
Merge from develop
2016-07-16 08:41:15 +01:00
Shaun Bennett
Timothy Andis
Shaun Bennett
Keir Nellyer
samczsun
LCastr0
Sam
Sarah
William Burns
cnr
Shaun Bennett
Sam
AlexTheCoder
Sam
xGamingDudex