e892476ca0
Setup enderchest API
2016-11-22 08:17:24 -05:00
325c0ab56c
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-21 19:13:34 +00:00
dd7e559a37
Merge remote-tracking branch 'origin/develop' into develop
...
* origin/develop:
Retry CTF proxy fix
Eternal Giveaway Fixes
Eternal giveaway refactoring
Revert: Disable Fated giveaway tools for now
Eternal Rank
2016-11-17 22:50:23 -05:00
3d5e61e0f1
Eternal Giveaway Fixes
2016-11-17 21:05:10 -05:00
562d7de1a9
Eternal giveaway refactoring
2016-11-17 21:05:10 -05:00
cdfd030999
Revert: Disable Fated giveaway tools for now
2016-11-17 21:05:10 -05:00
712019b45b
Eternal Rank
2016-11-17 21:05:10 -05:00
c080d41dc2
Temp DB fixes
2016-11-17 19:08:32 -05:00
0ca79f193f
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-17 21:20:28 +00:00
53b67214fb
More bugs
2016-11-17 21:20:00 +00:00
f6a694b4fc
Fix Metal Man distribution
2016-11-17 16:18:51 -05:00
142cf4dd93
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-17 19:41:47 +00:00
e845f7fca9
Disable Fated giveaway tools for now
2016-11-17 02:13:48 -05:00
b862a30c76
Thanksgiving Cosmetics ( #278 )
...
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location
* Removed(?) wildcard import
* Testing New year thing
Added some symbols to UtilBlockText
* Allow multiple pets with the same EntityType
* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location
* Removed(?) wildcard import
* Testing New year thing
Added some symbols to UtilBlockText
* Allow multiple pets with the same EntityType
* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions
* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...
* Fixed Pet menu
Fixed morph menu
Changed from List to Set
* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned
* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first
* Changed some stuff from Holiday Manager so now chickens will walk around when spawned
* Added sound effects to Metal Man
Added slowness to Metal Man
* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens
* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package
* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph
* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles
* Added hover ability to Metal Man Morph
* Fixed some stuff on Metal Man
2016-11-17 02:06:00 -05:00
db1598f896
Revert 1.11 disguise changes
...
Entity type tracking for disguises is now done in our spigot build.
2016-11-16 23:36:47 -06:00
cbc9aeedc6
Report Feature Improvements ( #269 )
...
Report Feature Improvements
2016-11-16 22:52:14 -05:00
7d14b6073d
Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map
2016-11-16 22:37:25 -05:00
1535fcc38b
Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks
2016-11-16 22:37:25 -05:00
22b7ce60eb
For sam
2016-11-17 02:56:58 +00:00
c21e71606d
Fix message line spacing for Prince Artix
2016-11-16 21:42:47 -05:00
b374d728f5
Change playwire button, modify player messages, and fix availability bugs
2016-11-16 21:42:47 -05:00
0070fed6c7
Fix playwire multithreading and convert to new 5-ticket per 24-hour system
2016-11-16 21:42:47 -05:00
824ef685c0
Add missing return
2016-11-16 21:42:47 -05:00
d5f89bb370
Add more blocked commands and move the blocked command handler below the Mineplex command executor
2016-11-16 21:42:47 -05:00
4cb257e84a
Tweak blocked commands system
2016-11-16 21:42:47 -05:00
0039b79281
Change Youtube Button Link ( #275 )
...
* Fix possible NPE in Preferences
* Change youtube button link
2016-11-16 20:23:14 -05:00
684432d7dc
Add Rules Command ( #272 )
...
* Added a /rules command
* Remove unused space
* More Spaces!
2016-11-16 19:59:24 -05:00
51c7801a9f
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-15 20:01:21 +00:00
70ca2c7964
Add 1.11 support
2016-11-15 13:58:31 -06:00
07cd716cf7
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-13 10:37:21 +00:00
af7557c9b1
When multiple accounts with the same name occur, pick the one that
...
logged in most recently
2016-11-09 01:25:33 +00:00
6273996ebe
Only set incognito and teleport player when report is hacking or
...
gameplay offense
2016-11-07 15:38:55 +00:00
6a9648e646
Solo Mode and Faster UHC
2016-11-05 11:06:12 +00:00
407ec0d924
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-11-03 20:11:21 +00:00
d93cdfee8f
Add Team stats display for Skyfall
2016-11-02 21:42:53 -05:00
9267a36528
Disable Halloween 2016 ( #261 )
...
* Removed all the halloween related items:
- Haunted chests can only be opened if player already had ammo
- Removed Halloween theme from the hub
- Removed pumpkins from in-game
* Added Halloween items to the Omega Chest
* Fixed weight for items in the omega chest
* Changed Disk to Disc in RewardManager
Changed values for omega rarities
* Final commit (removed win room test command)
* Removed Halloween words from Draw My Thing and Master Builders
2016-11-02 16:49:31 -04:00
afac2aea3f
Skyfall Update ( #262 )
...
* Fix some bugs, improve Skyfall and add Skyfall Teams
* re-enable debug
* Fix Perks not being unregistered from the EventHandler
* Remove unused import
* Remove unused imports
2016-11-02 16:48:44 -04:00
e73947b9b1
Hotfix pumpling pet being added to Haunted Chest
2016-11-02 16:47:38 -04:00
aaa248833e
Don't allow players to have more than 5 open snapshots at a time
2016-11-01 17:21:56 +00:00
828f39536b
Don't allow players to have more than 5 open reports at a time
2016-10-31 15:49:15 +00:00
b5ef642f39
Improve getReportHandling code
2016-10-30 22:13:52 +00:00
4971adcfb3
This should be an inner join
2016-10-30 01:53:52 +00:00
e72573d6fd
Fix getReports method not checking report cache first
2016-10-30 01:41:28 +00:00
8f07d377f1
Clear report cache after closing message has been sent, prevents
...
report cache being cleared and instantly reloaded
2016-10-30 01:25:06 +00:00
1405aef0c3
Update code to use column `creatorId` instead of `creator`
2016-10-30 01:16:40 +00:00
08f113bb99
Various improvements and fixes to report related database queries
2016-10-30 01:58:56 +01:00
ce4672f026
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-10-29 15:54:13 +01:00
7aa3daca9d
PC-1140 Fix various issues with region-locked reports
2016-10-29 15:54:01 +01:00
696a99b872
Refactor some parameter names to make method function more obvious
2016-10-29 15:26:02 +01:00
09e5d13b96
PC-1016 Rename column `creator` to `creatorId`
2016-10-29 14:27:19 +01:00
49c5df6e68
Parties: Check if target is null before inviting
2016-10-28 17:57:25 -04:00
a7986a0719
Party: Fix NPE
...
Filter out members who are no longer online when sending messages
2016-10-28 17:57:25 -04:00
e7b744f527
UHC rewrite
2016-10-28 17:56:08 -04:00
7a0fba3027
Make Trick Or Treat chests open 4
2016-10-28 00:10:17 -05:00
4b3cadbb5a
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
2016-10-27 23:53:32 +01:00
8283af25af
Remove resolved todo for metrics command
2016-10-27 23:49:40 +01:00
577e640f4a
Add KillAura Type E and F checks - no Action enabled yet
2016-10-26 23:00:47 -04:00
0c0ad5ab13
PPC Items ( #252 )
...
Update/ppc items
2016-10-26 22:30:58 -04:00
a340f15d63
Fixed changes requested by Shaun
2016-10-27 00:27:50 -02:00
d13387df52
Make trick or treat chest dynamically controlled ( #256 )
...
* Implement trick or treat chest in customer support server
* Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads
2016-10-26 22:02:46 -04:00
3bd575b718
PC-1153 Improve /reportmetrics usage
2016-10-26 13:29:11 +01:00
79b5439aa4
Small refactoring
2016-10-26 10:50:49 +01:00
a97ad8dd76
PC-1153 Don't allow days argument to exceed 30 days
2016-10-26 10:42:10 +01:00
f5a81f083e
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-10-26 10:28:13 +01:00
52d001c26e
PC-1153 Add /reportmetrics command
2016-10-26 10:28:01 +01:00
39f0cd79bb
Cap purchase date for sampson
2016-10-25 13:34:22 -04:00
3e8eecdf91
Update reward weightings for sigils
2016-10-25 13:34:22 -04:00
6d982f3df9
Fix spin ticket reward threading
2016-10-25 13:34:22 -04:00
273f95f8ff
Fix playwire threading
2016-10-25 13:34:22 -04:00
a36ebf4528
Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads
2016-10-25 13:34:22 -04:00
ff8f77f8d1
Rename these variables to make better sense
2016-10-22 23:08:59 +01:00
c6ca976653
PC-1139 Add /chatsnap command
2016-10-22 20:23:31 +01:00
81bf9bc406
Small method rename
2016-10-22 19:21:38 +01:00
35048b46a7
Report/snapshot code clean-up
2016-10-22 19:17:20 +01:00
e0d05d3c87
PC-1140 Keep reports region-separated
2016-10-22 15:06:18 +01:00
6de2df5cc4
Fixed lores
...
Fixed icons
Removed sleigh, chicken mount and wind up suit from menus
Added javadocs to sleigh
2016-10-22 02:27:44 -02:00
83ba1cb26e
- Removed debug message
...
- Added check for player teleport when opening a chest
- Added Turkey Morph and Chicken Mount to PowerPlayClubRewards
2016-10-21 18:48:47 -02:00
0d6ff42a8d
- Fixed players not being kicked from treasure chest locations when they are being opened
...
- Increased the time needed for the Wind Up suit to be charged
- Added effect for the Wind Up suit to blink between yellow and red when the effect is active
2016-10-21 18:06:13 -02:00
5f755add78
Rename /reportstats command to /reporthistory
2016-10-21 17:24:27 +01:00
56db128730
Merge pull request #251 from Mineplex-LLC/develop
...
Merge 'develop' into 'update/ppc-items'
2016-10-21 13:05:00 -02:00
b0ac3cac8c
Show link to view chat log in /reportinfo
2016-10-21 09:32:11 -04:00
63514029f2
Generate missing tokens for snapshots on report load
2016-10-21 09:32:11 -04:00
f8010f4ad0
Merge pull request #245 from Mineplex-LLC/update/report-improvements
...
Report Feature Improvements
2016-10-19 22:53:53 -04:00
38ef65c32e
Fix memory leak in ItemSnowball
2016-10-19 22:38:39 -04:00
2ed03147b0
Make WinEffectGadget clean up even if exceptions occur
2016-10-19 22:38:39 -04:00
5168044be5
Fix memory leak in WinEffectHalloween
2016-10-19 22:38:39 -04:00
bcb56c50f5
Fix memory leak in AntiHackGuardian
2016-10-19 22:38:39 -04:00
25d6a4239e
Fix memory leak in StatsManager, CombatManager
2016-10-19 22:38:39 -04:00
2b6d7a4d7a
Fix memory leak in ParticleFairy
2016-10-19 22:38:39 -04:00
a59dde44c6
Remove recharge data on quit instead of later
2016-10-19 22:38:39 -04:00
19eeae7f7f
Fix memory leak in ParticleFoot
2016-10-19 22:38:39 -04:00
6f80e21372
Fix memory leak in carl, server
2016-10-19 22:38:39 -04:00
bd9aa38afa
Make DisguiseManager clean up after lazy callers
2016-10-19 22:38:39 -04:00
a338fb27d3
Various memory leak fixes
2016-10-19 22:38:39 -04:00
c00502d91f
Fix memory leak in WinEffectPodium
2016-10-19 22:38:39 -04:00
894e6b4a89
Fix memory leak in CombatLogNPC
2016-10-19 22:38:39 -04:00
0cbd4a9de2
Fix memory leak in Teleport
2016-10-19 22:38:39 -04:00
dbd5203e9d
Fix memory leak in ParticleFreedom
2016-10-19 22:38:39 -04:00
6719f11358
Fix playwire command not requiring console to use it
2016-10-19 22:36:03 -04:00
13220e267c
Re-enable animation
2016-10-19 22:36:03 -04:00
16b195d2ab
Make playwire-given carl spin tickets update while the player is logged in
2016-10-19 22:36:03 -04:00
225f5c6b7c
Internal:
...
- Removed Win room test command
- Fixed spelling error in MountSpider
- Changed MountChicken so it can now jump
- Still working on the Sleigh morph
- Added Wind Up Suit for testing
- Removed unused code from MountSpider
External:
- Added Sleigh Morph (Still need some work on it)
2016-10-19 18:44:57 -02:00
db0bfece23
Prevent re-saves from un-aborting user reports
2016-10-16 23:23:55 +01:00
3db7e27ecd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/report-improvements
2016-10-15 15:23:26 +01:00
1ab646bbda
Fix error message colouring when there are no reports to handle
2016-10-14 19:14:50 +01:00
64bb01c92f
Move /reportabort functionality over to the /reportclose gui
2016-10-14 19:14:35 +01:00
28603ec8c5
Remove resolved TODOs
2016-10-14 18:47:25 +01:00
b6bda9418d
PC-1000 Make all token related things work together
2016-10-14 16:28:42 +01:00
8ebad90f52
Don't lock current month's cosmetic on resub day
...
This fixes an issue where a player might lose the current month's
cosmetic on the date of resubscription until his/her payment method was
charged
2016-10-14 00:26:33 -05:00
3b7169ad3d
PC-1000 Implement token generating method
2016-10-14 01:14:51 +01:00
8974b2b395
Fix Carl Error
2016-10-13 04:07:05 -04:00
62d08e74e3
Remove voting code
2016-10-12 22:54:14 -04:00
87122e9904
Update youtube link
2016-10-12 22:54:14 -04:00
63c14a99ab
Update playwire displayed cooldown time
2016-10-12 22:54:14 -04:00
6d36034115
Remove voting from carl the creeper, move spin tokens to playwire, unify link messages in all carl the creeper links
2016-10-12 22:54:14 -04:00
311751cc39
Pumpkin's Revenge ( #237 )
...
* Initial Commit
* Update
* Bunch of new stuff
* Fixed fletcher arrow typo
* Added reward pet, fixed typo, tweaked lose cinematic
* Lots of tweaks and fixes with QA
* Cleaning up a little code
* Removed debug message on prince death
* Added nighttime to halloween game lobby maps
* Tweaked spawn rates and mob caps
* Typo
* Tweaked texts, cleaned import and cleared all mobs from boss cinematic
* Fixed creepers not getting properly removed during boss cinematic
* Reward typo
* Fixed rare NPE
* Typos
* Tweaked mini zombie
* Typo
* Prevent zombie from spawning minis after being removed
* Tweaked wave announcements + formated WaveVictory
* Changed color of prince tag + formated ZombieSpawner
* Fixed (another) rare NPE
* Tweaked boss wave cinematic
2016-10-12 22:40:05 -04:00
03e219f552
Add header to /reportstats and further improvements
2016-10-13 02:15:49 +01:00
2e16eef5d9
Make /reportstats work with offline players and other small improvements
2016-10-13 01:18:23 +01:00
76539648da
PC-1109 Fix /reportstats if player doesn't have at least 5 reports in
...
each role
2016-10-12 17:36:54 +01:00
ca09253292
PC-954 Tweak error message when no reports are available for handling
...
Also close gui after clicking item and remove old un-necessary code.
2016-10-12 17:30:19 +01:00
f42678a9ef
PC-954 Fix incorrectly sized inventory
2016-10-12 17:23:42 +01:00
eb6d893414
PC-954 Allow staff to select what kind of report they'd like to handle
2016-10-12 17:15:48 +01:00
15cf3a2bee
PC-1019 Give indication of when a report is forwarded to a team
2016-10-11 14:30:43 +01:00
1f47d51935
Merge branches 'develop' and 'update/report-non-sequential' of github.com:Mineplex-LLC/Minecraft-PC into update/report-non-sequential
...
# Conflicts:
# Plugins/Mineplex.ReportSite/view.php
2016-10-11 00:55:26 +01:00
5c5c159ee3
Add support for assigning tokens to snapshots (excluding actual
...
generation part)
2016-10-11 00:22:29 +01:00
0dca2e9d46
Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub
2016-10-08 19:42:29 -04:00
e4d3621512
Create SnapshotMetadata class in prepartion of snapshot tokens
2016-10-07 18:25:20 +01:00
8ab61b2b06
Public:
...
- Added Chicken Mount
- Added Turkey Morph
Internal:
- Changed the Morph system (Using UtilMorph)
2016-10-06 14:19:44 -03:00
3707de6742
Made Haunted Chests buyable
2016-10-06 12:43:19 -04:00
a6727bf104
Halloween Fixes/Prep
2016-10-05 22:57:44 -04:00
c0754a23c8
Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players ( #232 )
...
* Added option to run /unlockcosmetics and /lockcosmetics for other players
* Fixed Slimeball Soccer field location
2016-10-05 22:08:27 -04:00
bd90c465dd
Update PPC button to reflect new claiming style
2016-10-05 22:03:04 -04:00
20c37bf3d6
Unlock PPC cosmetics on the first of the month
...
The relevant cosmetic will be revoked if the player's subscription
lapses during that month
2016-10-05 22:03:04 -04:00
8793be56ed
Add 'come back on $DATE' message to carl for Power Play
2016-10-05 22:03:04 -04:00
876d35b482
Cosmetics Bug Fixes ( #229 )
...
* Fixes for the Block Morph
* Fixes for the Witch Morph
* Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again
2016-10-05 17:16:25 -04:00
25000f7367
Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix
...
Report feature hotfixes
2016-10-05 17:13:08 -04: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
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
17b04a6a84
PC-1021 Prevent 'null' player being punished
2016-10-03 10:00:04 +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
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
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
dd5a284d55
Print stacktrace when unable to fetch report player is handling
2016-09-30 00:29:57 +01:00
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
Shaun Bennett
Sam
LCastr0
cnr
Shaun Bennett
AlexTheCoder
Alexander Meech
Sam
Keir Nellyer
xXVevzZXx
samczsun
xADudex
Sam Sun
TadahTech
William Burns
Shaun Bennett
Sam