e6bb0c2d78
Improve handling of circumstances whereby a report exists but no
...
corresponding chatsnap log on chatsnap site
2016-10-05 15:31:46 +01:00
8da5813f29
Add Halloween Cosmetics ( #227 )
...
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color
External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat
* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods
External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed
* Internal:
Renamed RewardType enums to have upper case
External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet
* Slack integration to test stuff (Will not be in the code in the last commit)
* Fixed Grim Reaper Hoe not being removed after the morph is disabled
* Details for the Haunted Chest
* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph
* Fixes for lores and names
Support server stuff
* Fixes for the Lock and Unlock cosmetics commands
* Fixes for the Grim Reaper Morph
* Fixes for the Grim Reaper Morph
Removed debug messages
* Fixed a memory leak. Thanks to Sam
* Fix imports
* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()
* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
2016-10-05 10:27:45 -04:00
a4e1fb3c8d
Prepare database for snapshot tokens
2016-10-05 14:31:01 +01:00
46db80a056
Always check game object is not null before attempting to access it ( #225 )
2016-10-04 15:32:04 -04:00
5d8c079be6
Understand the squid disguise code ( #217 )
2016-10-04 15:28:12 -04:00
22707d6d2e
Only execute if throwable is null
2016-10-04 16:34:19 +01:00
6709001c89
Remove double handle check, pointless and can potentially cause issues
2016-10-04 16:25:51 +01:00
afee339e16
Any report with a handler and no conclusion is an active report,
...
therefore we don't need to check if the report is active
2016-10-04 16:20:11 +01:00
c462282632
Merge branches 'bugfix/report-hotfix' and 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/report-hotfix
2016-10-04 10:40:43 +01:00
515fd9fb70
Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-10-03 22:44:24 -03:00
fb29947705
Fixes for the Witch Morph
2016-10-03 22:43:49 -03:00
53c6c07208
Lazer to Laser
2016-10-03 23:17:14 +01:00
e48dfbefe4
Even more fixes!
2016-10-03 21:20:15 +01:00
4e9cf4dbb4
More fixes
2016-10-03 19:45:15 +01:00
a923f80438
Accidentally missed out inserting reportTeams' "enums"
2016-10-03 19:24:01 +01:00
17b04a6a84
PC-1021 Prevent 'null' player being punished
2016-10-03 10:00:04 +01:00
0181e21853
Fixes for the Block Morph
2016-10-01 23:54:35 -03:00
668abad83a
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-01 15:49:10 +01:00
4bfc632fd5
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-01 15:45:05 +01:00
e867a09b5c
Update support server to accommodate power play changes
2016-09-30 21:52:07 -07:00
6e2512e0cf
Merge branch 'project-cosmetics' into develop
2016-09-30 21:47:08 -07:00
d00c887a84
Hide Power Play Metal Man reward for now
2016-09-30 21:00:02 -07:00
76fc4d6ac4
Merging
2016-10-01 00:46:36 -03:00
0797f90d3b
Fixes for the Witch Morph
2016-10-01 00:42:40 -03:00
25701dae7d
Enable Metal Man morph in the GUI
2016-09-30 20:25:57 -07:00
4b1b57d452
Add first-time signup Metal Man reward
2016-09-30 20:17:07 -07:00
64802769d6
Implement Power Play reward month calculations
2016-09-30 11:13:29 -07:00
7926d88d5b
Update report result reason length as future version of Minecraft
...
will be increasing message lengths
2016-09-30 17:18:47 +01:00
4fe5eb8b45
Stub out new Power Play rewards calculations
2016-09-30 00:10:42 -07:00
2a81f2b317
Fix UI for PlayWire changes
...
Fix memory leak in Menu
(cherry picked from commit 770c899)
2016-09-30 00:56:40 -04:00
36c26c0b2c
Fix MineStrike Issues ( #222 )
...
* Check if the costume is null before doing anything.
* Disable entity specing
2016-09-29 23:37:41 -04:00
81070eac62
Plug up memory leaks in IdleManager ( #224 )
...
Somehow, IdleManager was keeping Player references loaded
despite having removed them on PlayerQuitEvent.
This may be because of the runnable scheduled for 5 ticks after a teleport
which would insert players after they quit.
In any case, this was keeping entire worlds loaded in UHC. Pretty bad.
Moral of the story? Use UUIDs!
2016-09-29 23:29:53 -04:00
0caa84f703
Optimize Clan Banners ( #221 )
...
* Optimize BannerRepository.java
* Optimize banner loading in BannerManager.java
* Optimize banner loading in ClansManager.java
* Remove unnecessary runAsync
* Optimize Siege Weapon storage
* Forgot a ! in my while loop
2016-09-29 23:04:19 -04:00
7d4c817856
Game Lobby/Playwire/Command Fixes ( #223 )
...
* Tweak team locations to accommodate MPS'
Disable certain commands from being used.
* Change PlayWire things.
* Update MPS locations.
* Update.
* Remove debug
* Remove debug. Ty Sam
2016-09-29 23:00:26 -04:00
2a2cd5024a
Change message displayed when an error occurs
2016-09-30 01:56:49 +01:00
ee532c1b8e
Improve exception handling
2016-09-30 01:44:49 +01:00
de72f119fe
Don't allow players to handle new accounts in exceptional cases
2016-09-30 01:28:07 +01:00
4818936943
Prevent double exception logging
2016-09-30 01:16:30 +01:00
45eeac8cee
Prevent double exception printing when an error occurs whilst saving
...
a report
2016-09-30 01:05:50 +01:00
26d6540b2f
Fix closing reason being truncated with long closing messages
2016-09-30 00:36:52 +01:00
dd5a284d55
Print stacktrace when unable to fetch report player is handling
2016-09-30 00:29:57 +01:00
22f8a1496a
Guardian fixes
2016-09-29 22:44:03 +01:00
9d6985ddcd
Fix MPS zip file name, null amp stand
2016-09-29 09:10:25 -04:00
b3d8c72953
Add Game Lobby world settings ( #220 )
2016-09-29 00:22:42 -04:00
7ff6e33941
LegacyGameLobbyManager bug fixes
2016-09-28 23:05:02 -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
c4e36b2269
Moppletop's September Bug Sprint ( #214 )
...
* Earth Cost issue
* Instances of "Tip" to "Thank"
* PC-930
Fix an infinite loop when the game ends.
* PC-959
Fixes an issue where people could spam drop grenades.
* PC-668
Cosmetic Set bonuses no longer carry into MS games
* Changes metal's passive
Metal's passive is now that it gains 0.5 hearts per armor piece. This
avoids the problem of being unkillable
2016-09-27 21:11:49 -04:00
78e6f3bf71
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-27 19:02:56 +01:00
68c62acb00
Guardian changes
2016-09-27 19:02: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
96e1e944e1
Addition of the GWEN kit and a billion other things
2016-09-25 22:32:23 +01:00
b35d933e56
Fix PlayWire error, handle future errors properly
2016-09-25 16:28:02 -04:00
3f3241bec9
Reformat developer servers
2016-09-25 16:28:01 -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
42ea7f85af
Remove un-required tab changes
2016-09-25 01:36:23 +01:00
17b98888fc
Update database upgrade script for latest changes
2016-09-25 01:29:18 +01:00
f8a135cf50
Full system conversion
2016-09-25 00:56:06 +01:00
315a50aa16
Whoops
2016-09-24 21:34:45 +01:00
baafa62713
Just more converting
2016-09-24 21:09:25 +01:00
1475243d8a
Added MetalMan to the GUI for testings
2016-09-23 23:14:10 -03:00
f5a7f35d94
More kits
2016-09-23 18:58:14 +01: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
f6acedba5f
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-22 17:11:25 +01:00
2ba2b21577
Progress on converting SSM to a new cleaner system
2016-09-22 17:11:21 +01: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
7f447f8084
Setup compass for game changes
2016-09-22 00:33:48 -04:00
a3d210871d
Add ignored checks to GWEN ( #211 )
2016-09-21 23:21:02 -04:00
e15804fc15
Prevent players from joining 1.9+ games with 1.8 clients ( #212 )
2016-09-21 23:19:55 -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
209ea32ef9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-20 09:18:20 +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
93c227a22d
Change Mavs Basketball to 5 Minutes ( #201 )
...
* Update ScoringManager.java
* Update Basketball.java
2016-09-14 20:49:24 -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
1458cb84b9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-14 20:14:05 +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
38473dcffd
Fix metal taking too little damage with full iron ( #203 )
2016-09-10 22:47:52 -04:00
f6b06c63ac
Fixes for the Omega chest giving duplicated items
2016-09-10 00:43:08 -03:00
23a330d449
Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode
2016-09-08 03:50:45 -04:00
e12ed35da1
Fix NPE and kit upgrades issue
2016-09-07 23:13:28 -04:00
493086fcf3
Merge pull request #198 from Mineplex-LLC/update/developer-servers
...
Update/developer servers
2016-09-07 21:21:35 -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
fba449ca03
Don't rearrange GUI if all dev servers are ingame
2016-09-07 19:17:47 -04:00
a8adf23c15
Allow dev servers
2016-09-07 11:45:42 -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
ba322f0df1
Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes
...
Update/emergency support fixes
2016-09-07 07:57:53 -04: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
5bf35d49db
Message inconsistancy
2016-09-06 21:38:43 +01:00
be268991b0
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-06 21:37:33 +01:00
7a5a6c3d00
Fix duplicate message
2016-09-06 19:55:31 +01: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
64db10c91a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes
2016-09-05 20:27:09 -04:00
a124aa3d85
Fix items added via support server not showing up in customer service logs
2016-09-05 20:25:02 -04:00
444fe5d151
Remove hacky reflection method to get server name
2016-09-05 18:37:17 -04:00
08090f5e06
PC-818
...
Seismic Charges can no longer remove barrier blocks
2016-09-05 18:25:16 -04:00
11c97691a9
PC-937
...
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
2016-09-05 18:25:16 -04:00
6490ab3786
Don't hide banwave animation from staff
2016-09-05 18:25:16 -04:00
3aaa9b2514
Sort tab list properly
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
e2455bbc9d
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-05 20:04:12 +01:00
ccd81c1820
Fix BlockIgniteEvent NPE in MavericksManager
2016-09-05 13:42:24 -05:00
12130d41e6
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-05 17:59:51 +01:00
8ebaad4736
Beta ready commit
2016-09-05 17:59:49 +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
a7b0c9de05
Fix unnecessary calls to mysql/mssql databases in support server
2016-09-05 04:46:13 -05:00
504432d87b
Fix titan command not being registered
2016-09-05 04:46:01 -05:00
9ce49b10c0
Add a command to allow support agents to check for ownership of internal sales packages
2016-09-05 04:45:51 -05:00
ffb6073532
Fix unnecessary calls to mysql/mssql databases in support server
2016-09-04 23:44:54 -04:00
b5771550ad
Fix titan command not being registered
2016-09-04 23:28:25 -04:00
866c3ee7c9
Add a command to allow support agents to check for ownership of internal sales packages
2016-09-04 22:11:05 -04:00
29bb2a3895
Add an enjin chargeback command and fix punishing in support servers
2016-09-04 00:39:44 -05:00
b3478d70e8
Update support packages
2016-09-04 00:39:44 -05:00
5b80f3b6ac
Fix clan banner being removed from support server information
2016-09-04 00:39:44 -05:00
e2d3763ec0
Add an enjin chargeback command and fix punishing in support servers
2016-09-03 15:42:32 -04:00
34ee62bdc3
Fix NPE
2016-09-03 20:32:10 +01:00
3088d79cf5
Update support packages
2016-09-03 15:16:59 -04: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
fc0217f1fd
More magic OITQ
2016-09-03 18:25:17 +01:00
e0424c78b2
Added spawn barrier
2016-09-03 18:24:56 +01:00
7eb148cc59
Ultimate colour change
2016-09-03 18:24:44 +01:00
09a535466a
Fix clan banner being removed from support server information
2016-09-03 11:37:45 -04:00
e57d009341
Remove unused import!
2016-09-03 01:11:50 -04:00
586a768c7b
Fix enjin listener else bug
2016-09-03 00:59:15 -04: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
2bce540c5d
Disable Antihack in the staff server
2016-09-02 02:51:34 -05:00
374142e63f
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:42:51 -05:00
e2f974e1e6
Add sounds and messages to basketball.
2016-09-02 00:40:23 -05:00
ae0d30558c
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:12:12 -05:00
9abbe1bfb9
Update support whitelist and op list
2016-09-02 00:10:36 -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
d8486abbfd
Fix minor best game issues.
2016-09-01 20:05:53 -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
a6360249b7
Use party if a player has it.
2016-09-01 08:47:43 -05:00
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
41936e0efc
Remove users from the map.
2016-09-01 08:31:16 -05:00
fdc54e1dd1
Fix BestGame not cancelling for parties.
2016-09-01 08:29:51 -05:00
05f640266f
Fix basketball scoring infinite loop
2016-09-01 06:36:47 -05:00
107a296239
Fuck you intellij
2016-09-01 05:49:59 -05:00
53846acbf6
Dont let Minestrike use NextBestGame
2016-09-01 05:39:47 -05:00
9fcee07427
Fix people getting stuck in chests.
2016-09-01 05:34:37 -05:00
68743cf73c
Mavs changes.
2016-09-01 03:24:38 -05:00
46053e82e1
Mavs changes.
2016-09-01 02:35:31 -05:00
c0c75ea375
Allow team selecting to work on the mavs hub.
2016-08-31 23:46:29 -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
57292414c6
Gems for winners
2016-08-31 22:55:13 +01: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
0b7fdc01eb
Initial balence change
2016-08-31 16:30:50 +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
6a139d5c55
Tiny code improvement
2016-08-31 13:28:48 +01:00
7599630328
Pyromancer Ultimate name change
2016-08-31 13:27:07 +01:00
8d222aafec
Fix increasing loop in Overtime
2016-08-31 13:26:54 +01:00
1bfebf358f
Add Overtime
2016-08-31 12:07:50 +01:00
47df09b770
Handle null sound
2016-08-31 12:07:35 +01:00
b1faecea49
Kit Fire incorrect values
2016-08-31 12:07:25 +01:00
41bae9d5f8
Add bottom margin so that big chat logs do not collide with footer
2016-08-31 10:45:38 +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
8397f53d39
Remove unneeded teleportation in clans hubs
2016-08-30 03:27:11 -04: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
5108a6f08d
Convert to npc for entering mavericks lobby
2016-08-30 01:02:26 -04:00
d7d8ef021e
Disable using cosmetics inside mavericks hub
2016-08-30 00:47:48 -04:00
94bfc9aa15
Use proper server group / remove testing.
2016-08-29 22:33:01 -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
464c9fcdc3
Update steal chance
2016-08-29 20:37:02 -04:00
3687c7ad98
PowerPlayClub update
2016-08-29 21:32:11 -03:00
f3e38031ab
Add shadowmuting
2016-08-29 18:57:07 -04:00
7a3ce9813c
Payload (OITQ)
2016-08-29 23:08:04 +01:00
9454e1f409
Skywars and Kit Progression
2016-08-29 23:07:48 +01:00
b30f395d88
Update chat snap site for backend changes
2016-08-29 12:21:57 +01:00
ec8ed76270
Convert old perks to new perks
2016-08-28 09:06:07 +01:00
88f4813534
Perk related issue
2016-08-28 09:05:49 +01:00
ccd855da84
Name the ultimates
2016-08-28 09:05:31 +01:00
54e8f8e5e8
Code improvement and cleanup
2016-08-28 09:05:11 +01:00
34c6e1cab7
Add the base of kit progression
2016-08-28 09:04:46 +01:00
d81ed348f3
Remove used import
2016-08-28 09:04:09 +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
4bc49e6133
Solve merge conflicts
2016-08-26 21:21:18 +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
c2344a0494
Magnet not giving the kill
2016-08-25 20:26:18 +01:00
265ab620e4
Fix Magnet affecting teams members
2016-08-25 20:10:13 +01:00
9c5ab7c67e
Remove Fire Aspect 2
2016-08-25 20:09:50 +01:00
2a861460c6
Remove unused variables
2016-08-25 05:12:29 -05:00
b3b8f44b3a
Fix perks not being registered.
2016-08-25 05:11:52 -05:00
f976f56fb7
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
2016-08-25 04:26:21 -05:00
ebfd00ebc3
Fix centering of the Preference Menu
2016-08-25 04:04:53 -05:00
f9cc505908
Minor tweaks to soccer fields
2016-08-25 04:02:17 -05:00
19cfcc414b
Fix stacking minecarts
2016-08-25 03:58:39 -05:00
41b40fa12c
Fix painting breaking.
2016-08-25 03:54:10 -05:00
8617572980
Fix preferences menu interaction in Clans{,Hub}
2016-08-25 02:26:42 -05:00
77e0090531
Tweak preferences
2016-08-25 00:17:31 -05:00
f518185518
Tweak parkour
2016-08-24 22:55:39 -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
352e1e0eb2
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:22:01 -05:00
df1fc60d3d
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:12:58 -05:00
4088d2a311
Air teleportation fix
...
Makes it less likey that a player would die of fall damage when using
the eye of ender
2016-08-24 19:50:38 +01: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
42c228773c
Fix entity directions
2016-08-23 01:52:19 -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
e0f319ea09
Change kit internal names
...
Changes the kit internal names to match the current skywars ones in
order so that kit progression experience is carried over during this
update.
2016-08-22 17:28:51 +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
7db41a8be5
Reduce Earth kit scaling
2016-08-20 22:45:17 +01:00
28bbda23f5
Remove debug commands
2016-08-20 22:44:54 +01:00
e6530a6f44
More tweaks and fixes
2016-08-20 12:14:01 +01: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
5365f1269f
Delay Anticheat enable in Clans
...
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
72ddfd5d85
Disable server spawn radius in Clans
...
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -05: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
3b11a2e985
Killstreaks
2016-08-18 22:02:33 +01: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
c66e485c9e
Fix arrow knockback
2016-08-17 23:22:30 -04:00
6c1bd88631
Increase passive knockback
2016-08-17 23:33:31 +01:00
1565b66395
Ore level changes
2016-08-17 23:33:17 +01:00
8d6e4a5fd3
Remove some unused code and cleanup
2016-08-17 22:28:22 +01: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
604f5bc2cc
Update to work with new scoreboard system
2016-08-16 11:03:12 +01:00
29a07c60ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-16 11:02:15 +01:00
84e5b38380
Testing session feedback
2016-08-16 10:53:37 +01:00
dac4d9595c
Change scoreboard to use new system
2016-08-15 20:28:12 +01:00
6839006bd1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-15 20:25:01 +01:00
d5d8f07085
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple
2016-08-15 19:21:56 +01:00
df606d5e07
Changed game logic to try out multiple round concept
2016-08-15 19:19:20 +01:00
09741d4d2a
Added VersionModule (The new way to check client versions for games)
2016-08-15 19:18:51 +01:00
ea7d877d36
Some attempt at per player kits
2016-08-15 17:45:24 +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
Keir Nellyer
LCastr0
Sam Sun
Sam
cnr
TadahTech
Sam
Alexander Meech
Shaun Bennett
Shaun Bennett
samczsun
Sarah
William Burns
AlexTheCoder
Shaun Bennett
Sam
xGamingDudex