JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,621 Commits 1 Branch 0 Tags 481 MiB
ddab450c8e
Commit Graph

9331 Commits

Author SHA1 Message Date
Shaun Bennett
cbc9aeedc6 Report Feature Improvements (#269) 
Report Feature Improvements
 2016-11-16 22:52:14 -05:00
Shaun Bennett
c250796bdf Fix pom.xml formatting 2016-11-16 22:37:25 -05:00
AlexTheCoder
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
AlexTheCoder
5e1fcabe36 Final changes for S2 2016-11-16 22:37:25 -05:00
AlexTheCoder
a8e3a530c1 Prevent safely logging out in shop zones while tagged 2016-11-16 22:37:25 -05:00
AlexTheCoder
4a186a8dec Disable crafting of hoppers 2016-11-16 22:37:25 -05:00
AlexTheCoder
4fc2b875d4 Add a clans map generator to codebase 2016-11-16 22:37:25 -05:00
AlexTheCoder
a219a2d072 Fix TNT breaking bedrock, increase build height and add a minimum chest place height 2016-11-16 22:37:25 -05:00
AlexTheCoder
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
AlexTheCoder
63ef68976c Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective 2016-11-16 22:37:25 -05:00
Sam
22b7ce60eb For sam 2016-11-17 02:56:58 +00:00
Alexander Meech
c21e71606d Fix message line spacing for Prince Artix 2016-11-16 21:42:47 -05:00
AlexTheCoder
b374d728f5 Change playwire button, modify player messages, and fix availability bugs 2016-11-16 21:42:47 -05:00
AlexTheCoder
0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
AlexTheCoder
824ef685c0 Add missing return 2016-11-16 21:42:47 -05:00
AlexTheCoder
d5f89bb370 Add more blocked commands and move the blocked command handler below the Mineplex command executor 2016-11-16 21:42:47 -05:00
AlexTheCoder
4cb257e84a Tweak blocked commands system 2016-11-16 21:42:47 -05:00
Sam Sun
4709161180 Attempt to fix CTF Proxies (#280) 2016-11-16 21:40:42 -05:00
md-5
735550c157 Use Mineplex Pair Util Class in Halloween 2016 (#274) 
JavaFX is not included in OpenJDK.
 2016-11-16 20:29:33 -05:00
Shaun Bennett
0039b79281 Change Youtube Button Link (#275) 
* Fix possible NPE in Preferences

* Change youtube button link
 2016-11-16 20:23:14 -05:00
Sam
8d6eb13504 Add "%player% is your teammate" in 2 player team games (#273) 
* Add "%player% is your teammate" in 2 player team games

* Add to Team Skyfall
 2016-11-16 20:10:16 -05:00
Sam
684432d7dc Add Rules Command (#272) 
* Added a /rules command

* Remove unused space

* More Spaces!
 2016-11-16 19:59:24 -05:00
Sam
51c7801a9f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-15 20:01:21 +00:00
cnr
70ca2c7964 Add 1.11 support 2016-11-15 13:58:31 -06:00
Sam
faba1f2369 Forgot the actual UHC class... 2016-11-13 12:35:48 +00:00
Sam
efc73d220f Change how UHC handles time 2016-11-13 12:35:38 +00:00
Sam
07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam
aa4ef9f4ad Big bugs 2016-11-12 21:50:38 +00:00
Keir Nellyer
6e5db69b0c Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-10 13:52:44 +00:00
Sarah
e71187aa33 Add new Brawl Games (#260) 
* add more Brawl games

* fix some bugs in new brawl games

* fix even more bugs

* Fix some super paintstrike bugs

* Add some Javadoc
 2016-11-09 20:38:49 -05:00
Keir Nellyer
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
Nate Mortensen
3b83a9bdc3 Reformat Block Hunt 2016-11-08 10:44:39 -05:00
Nate Mortensen
6db79c3ca5 Remove disguises when players switch to Seeker 2016-11-08 10:44:39 -05:00
Nate Mortensen
0607355ee0 Prevent cloaked players from having their visibility reset 2016-11-08 10:44:39 -05:00
Nate Mortensen
e3b701f948 Don't give infestors an initial disguise 2016-11-08 10:44:39 -05:00
Keir Nellyer
6273996ebe Only set incognito and teleport player when report is hacking or 
gameplay offense
 2016-11-07 15:38:55 +00:00
Sam
6a9648e646 Solo Mode and Faster UHC 2016-11-05 11:06:12 +00:00
xXVevzZXx
af7de62ff7 Fix non upgradeable perks being not unregistered 2016-11-04 06:02:13 -05:00
Keir Nellyer
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
xXVevzZXx
d93cdfee8f Add Team stats display for Skyfall 2016-11-02 21:42:53 -05:00
Nate Mortensen
f587445ffc Remove extraneous horses when the game ends 
When players using the horseman kit win a game,
they never die, which is the only time that spawned
horses are removed.  To fix this, at the end of the
game all horses belonging to players that have survived
are explicitly removed, which removes all remaining horses.
 2016-11-02 17:01:17 -04:00
LCastr0
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
Sarah
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
Sam
b122fba97e Fix arrows not getting removed! 2016-11-02 16:48:01 -04:00
Alexander Meech
1f69c204f6 Fix Trick or Treat Chest Logging in Cust Server 2016-11-02 16:47:38 -04:00
Alexander Meech
e73947b9b1 Hotfix pumpling pet being added to Haunted Chest 2016-11-02 16:47:38 -04:00
Keir Nellyer
aaa248833e Don't allow players to have more than 5 open snapshots at a time 2016-11-01 17:21:56 +00:00
Keir Nellyer
828f39536b Don't allow players to have more than 5 open reports at a time 2016-10-31 15:49:15 +00:00
Keir Nellyer
b5ef642f39 Improve getReportHandling code 2016-10-30 22:13:52 +00:00
Keir Nellyer
4971adcfb3 This should be an inner join 2016-10-30 01:53:52 +00:00
Keir Nellyer
e72573d6fd Fix getReports method not checking report cache first 2016-10-30 01:41:28 +00:00
Keir Nellyer
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
Keir Nellyer
1405aef0c3 Update code to use column creatorId instead of creator 2016-10-30 01:16:40 +00:00
Keir Nellyer
08f113bb99 Various improvements and fixes to report related database queries 2016-10-30 01:58:56 +01:00
Keir Nellyer
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
Keir Nellyer
7aa3daca9d PC-1140 Fix various issues with region-locked reports 2016-10-29 15:54:01 +01:00
Keir Nellyer
696a99b872 Refactor some parameter names to make method function more obvious 2016-10-29 15:26:02 +01:00
Keir Nellyer
3dc441d61d PC-1016 Delete snapshots > 30 days and not linked to report in 
cleanup task
 2016-10-29 14:38:16 +01:00
Keir Nellyer
09e5d13b96 PC-1016 Rename column creator to creatorId 2016-10-29 14:27:19 +01:00
Keir Nellyer
eb37c5da2e PC-1016 Create column created to store date time for snapshots 2016-10-29 14:26:16 +01:00
samczsun
07c93606f8 GameChatManager: Check if the game exists 2016-10-28 17:57:25 -04:00
samczsun
873e93747e HolidayManager: Fix CME 2016-10-28 17:57:25 -04:00
samczsun
49c5df6e68 Parties: Check if target is null before inviting 2016-10-28 17:57:25 -04:00
samczsun
1d961c7d81 GamePlayerManager: Don't load kits if offline 2016-10-28 17:57:25 -04:00
samczsun
a7986a0719 Party: Fix NPE 
Filter out members who are no longer online when sending messages
 2016-10-28 17:57:25 -04:00
samczsun
d2a2fdfd46 UHC: Fix NPE 
Players who joined after the gamestate has been set to PREPARE
should not be considered as in the game
 2016-10-28 17:57:25 -04:00
samczsun
a729b03ce7 UtilParser: Handle null lastDamageCauses 2016-10-28 17:57:25 -04:00
samczsun
0c1f6cbedc Rewrite CombatLogModule 2016-10-28 17:57:25 -04:00
samczsun
70ed2e4fbb CompassModule 
Integrate with CombatLogModule
 2016-10-28 17:56:46 -04:00
samczsun
e8becf3819 Op on dev servers too 2016-10-28 17:56:08 -04:00
samczsun
e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04:00
Keir Nellyer
f0f01b74e8 PC-1016 Schedule cleanup task for everyday at 00:00 CDT 2016-10-28 18:13:20 +01:00
samczsun
7a0fba3027 Make Trick Or Treat chests open 4 2016-10-28 00:10:17 -05:00
Keir Nellyer
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
Keir Nellyer
8283af25af Remove resolved todo for metrics command 2016-10-27 23:49:40 +01:00
Keir Nellyer
e7ff175eff Remove report site token todo message (is now resolved) 2016-10-27 23:48:54 +01:00
Keir Nellyer
30f56e3b12 PC-1016 Add cleanup task sql script 2016-10-27 23:40:09 +01:00
Keir Nellyer
100dc53ead PC-1150 Close div's correctly 2016-10-27 16:09:11 +01:00
Keir Nellyer
3bcfa6adc5 PC-1150 Only show information section of site when report is being 
displayed
 2016-10-27 15:34:07 +01:00
Shaun Bennett
577e640f4a Add KillAura Type E and F checks - no Action enabled yet 2016-10-26 23:00:47 -04:00
Shaun Bennett
0c0ad5ab13 PPC Items (#252) 
Update/ppc items
 2016-10-26 22:30:58 -04:00
LCastr0
a340f15d63 Fixed changes requested by Shaun 2016-10-27 00:27:50 -02:00
Shaun Bennett
f06325d972 Super Smash Mobs Update (#243) 
Update/ssm
 2016-10-26 22:03:43 -04:00
Alexander Meech
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
Keir Nellyer
3bd575b718 PC-1153 Improve /reportmetrics usage 2016-10-26 13:29:11 +01:00
Keir Nellyer
79b5439aa4 Small refactoring 2016-10-26 10:50:49 +01:00
Keir Nellyer
a97ad8dd76 PC-1153 Don't allow days argument to exceed 30 days 2016-10-26 10:42:10 +01:00
Keir Nellyer
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
Keir Nellyer
52d001c26e PC-1153 Add /reportmetrics command 2016-10-26 10:28:01 +01:00
Alexander Meech
39f0cd79bb Cap purchase date for sampson 2016-10-25 13:34:22 -04:00
Alexander Meech
3e8eecdf91 Update reward weightings for sigils 2016-10-25 13:34:22 -04:00
Alexander Meech
6d982f3df9 Fix spin ticket reward threading 2016-10-25 13:34:22 -04:00
Alexander Meech
273f95f8ff Fix playwire threading 2016-10-25 13:34:22 -04:00
AlexTheCoder
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
AlexTheCoder
ab228fb492 Implement trick or treat chest in customer support server 2016-10-25 13:34:22 -04:00
cnr
44e016f272 Fix infinite loop in GameWorldManager 2016-10-25 01:44:07 -05:00
Keir Nellyer
e4c7e31185 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-24 15:00:10 +01:00
Alexander Meech
d6dc750ece Prevent MPS servers with Lobbyblablabla-1 as... 
...the name from being loaded as an applicable lobby server
 2016-10-24 01:21:56 -04:00
xGamingDudex
eaee382e7f Small typo 2016-10-23 16:22:27 +02:00
xGamingDudex
c0ec1e1ff7 Prevent infinite speed effect on creeper 2016-10-23 03:11:51 +02:00