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

3938 Commits

Author SHA1 Message Date
LCastr0
c11755558e Ops, those comments are wrong... 2016-12-26 18:27:01 -02:00
LCastr0
1d2a538fd6 Renamed Balloons page name 2016-12-26 18:23:27 -02:00
LCastr0
b422832276 Fixed Cosmetics menu positions 2016-12-26 18:22:57 -02:00
LCastr0
4ebc82bf1f Added balloons 2016-12-26 18:10:42 -02:00
Sam
a4a039b619 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-25 22:09:03 +00:00
LCastr0
fb9720c926 Added padding to menu 2016-12-25 16:21:46 -02:00
LCastr0
7e6810e10f Added a balloon to the menu 2016-12-25 16:12:05 -02:00
LCastr0
45d4e5ce6e Added Balloons to the cosmetics menu 2016-12-25 16:01:49 -02:00
LCastr0
246db919d9 Changed permissions for Unlock Cosmetics 2016-12-25 15:35:53 -02:00
LCastr0
de73307754 Added morph to january ppc prize 2016-12-25 15:35:25 -02:00
LCastr0
140da98922 Merge branch 'develop' into feature/dinnerbone-morph 2016-12-25 15:34:00 -02:00
samczsun
10bed92a6a Change morph description 2016-12-24 17:38:29 -05:00
samczsun
fe8823c134 Re-order morphs 2016-12-24 17:38:09 -05:00
samczsun
81d769db5b Fix issues regarding disguising 2016-12-24 14:18:33 -05:00
samczsun
eacbdfdb02 Convert morph to packets 2016-12-24 14:07:41 -05:00
cnr
73cefb69c9 Use redis pipeline for community player statuses 2016-12-24 00:39:59 -07:00
cnr
08d65f3662 Load communities with 4 queries instead of 3n+1 2016-12-23 21:33:17 -07:00
LCastr0
0aec8889fa Added lore 2016-12-23 23:56:43 -02:00
AlexTheCoder
35a9eabf74 Use UUID object instead of String for PlayerStatus and FriendStatus, as well as update CommunityJoinRequestInfo on a task 2016-12-23 18:34:52 -05:00
AlexTheCoder
74a6071d4e Refactor Redis PlayerStatus to use UUID as a key instead of Name, and make communities not force every server to subscribe to join publishes from proxies 2016-12-23 18:03:08 -05:00
AlexTheCoder
4ae21e66c9 Delete new communities if the leader has been transferred a new community during creation 2016-12-23 18:03:08 -05:00
LCastr0
675642a100 Disable on tp and do not allow mounts 2016-12-23 19:53:49 -02:00
LCastr0
9fad633b88 Ops, lava, not water 2016-12-23 19:13:50 -02:00
LCastr0
c0afad0723 Fixed morph with lava, water, void and ender pearls 2016-12-23 18:15:26 -02:00
LCastr0
7f6f3464a1 Fixed chest pages again 2016-12-23 17:48:37 -02:00
William Burns
1e0ba62557 To many typos. 2016-12-23 11:15:46 -07:00
AlexTheCoder
7a482c3386 Implement system to run code when an SQL error occurs, and ensure that duplicate key errors on community creation inform the community creator 2016-12-22 22:32:04 -07:00
AlexTheCoder
ac8d8aa69c Prevent Name value in info classes from being null 2016-12-22 22:32:04 -07:00
AlexTheCoder
0a69562579 Improve communities member page sorter to base on role as well as name and online status 2016-12-22 22:32:04 -07:00
AlexTheCoder
09e711e202 Properly get online player key from redis 2016-12-22 22:32:04 -07:00
AlexTheCoder
8e9336ad23 Make community button refresh with join requests 2016-12-22 22:32:04 -07:00
AlexTheCoder
9acd6b7832 Ensure comparison of ints with == instead of Integers 2016-12-22 22:32:04 -07:00
AlexTheCoder
286a9fe246 Fix various synchronization issues and make community creation load the new community through redis instead of a database call 2016-12-22 22:32:04 -07:00
AlexTheCoder
66c6f66768 Fix threading of community create command and make invite loader run on a LoginProcessor 2016-12-22 22:32:04 -07:00
AlexTheCoder
36f671d944 Use UtilPlayer.message instead of sender.sendMessage to fit standards 2016-12-22 22:32:04 -07:00
AlexTheCoder
e5aaa555b7 Make join request name updating redis-based 2016-12-22 22:32:04 -07:00
AlexTheCoder
56ecab1985 Make community membership updating entirely redis-based 2016-12-22 22:32:04 -07:00
samczsun
a0716ae774 Try to prevent duplicate bans even more 2016-12-22 22:42:07 -05:00
samczsun
1bcbddee87 Remove VL logging for good 2016-12-22 22:32:56 -05:00
LCastr0
6870bf31db Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph 2016-12-23 00:53:18 -02:00
LCastr0
4c58e852d0 Fixed a bug with treasure pages after buying a chest 2016-12-23 00:53:01 -02:00
samczsun
bbd695981d Don't summon titles if player is morphed 2016-12-22 21:06:39 -05:00
cnr
df5c53766c Disable VL logging 2016-12-22 17:54:50 -07:00
cnr
ca19840b19 Revert "Disable communities temporarily." 
This reverts commit 6d5d2b551b.
 2016-12-22 16:50:35 -07:00
cnr
2fe9423196 Remove inner query in CommunityRepository 2016-12-22 16:44:26 -07:00
LCastr0
7322e05ac4 Added the custom display item to menus 2016-12-22 18:58:38 -02:00
LCastr0
38e9daa377 Added display item feature again 2016-12-22 18:23:42 -02:00
LCastr0
ac6440a3c6 Merge branch 'develop' into feature/dinnerbone-morph 2016-12-22 17:09:33 -02:00
Kenny
253c907ba1 Update Anticheat dependency in core 2016-12-22 12:33:27 -05:00
William Burns
6d5d2b551b Disable communities temporarily. 2016-12-22 17:07:36 +00:00
cnr
69670a4b99 Pass accountId at community creation time 2016-12-22 01:17:44 -07:00
LCastr0
09afab39d6 Merge branch 'develop' into feature/dinnerbone-morph 2016-12-22 03:51:40 -02:00
AlexTheCoder
623703cc76 Insert MCS as type Community in redis 2016-12-21 19:31:57 -07:00
AlexTheCoder
65522a364f Update lobby file used by MCS 2016-12-21 19:31:56 -07:00
AlexTheCoder
0b92bc2263 Fix redis host value for MCS 2016-12-21 19:31:56 -07:00
AlexTheCoder
b73e51b345 Fix invites and member data loading communities from the wrong regions 2016-12-21 19:31:56 -07:00
AlexTheCoder
d4904fa02a Fix communities commands having incorrect coloring in their help messages 2016-12-21 19:31:56 -07:00
AlexTheCoder
d0c2906467 Fix community invites storing twice in player data if it is a duplicate 2016-12-21 19:31:56 -07:00
AlexTheCoder
1190d4a427 Fix communities queries having the ability to lock the server mysql connections due to nesting, improve RepositoryBase by allowing all the methods to be passed a Connection object to reuse it, and fix duplicate invites throwing an sql error 2016-12-21 19:31:56 -07:00
AlexTheCoder
cc3842f019 Synchronize BrowserIds List and update the browser GUI when a contained community is disbanded 2016-12-21 19:31:56 -07:00
AlexTheCoder
941b33bcfc Replace Integer == with Integer.intValue() == so as to avoid edge case errors 2016-12-21 19:31:56 -07:00
AlexTheCoder
07f2679275 Fix preference ordinal being shifted due to community invite preference being added in the middle, and added region-locking to community names so as to stop EU and US communities from having the same name due to independent redii 2016-12-21 19:30:54 -07:00
AlexTheCoder
eabda7f8c6 Fix alpha numeric check and slight potential concurrency issues 2016-12-21 19:30:54 -07:00
AlexTheCoder
bcbc6fdea4 More fixes and stylistic changes from iteration 2016-12-21 19:30:54 -07:00
AlexTheCoder
92e5c74fff Update PersonalServerManager to launch the MCS with the community's favorite game 2016-12-21 19:30:54 -07:00
AlexTheCoder
2611ba7a7a Bugfixes from iteration, & new features requested by sampson sigils and relyh 2016-12-21 19:30:53 -07:00
AlexTheCoder
2cacbcbc1c Update community repository to latest changes 2016-12-21 19:30:27 -07:00
AlexTheCoder
1a3a48115c Set up personal server manager to be able to create an MCS 2016-12-21 19:30:27 -07:00
AlexTheCoder
095fbfa255 Fix error caused by GIT client with MCS themes and actually register redis commands in the miniplugin 2016-12-21 19:30:27 -07:00
AlexTheCoder
bd4fa1f2d4 Convert to MCS system for community servers and add a command to open them 2016-12-21 19:30:26 -07:00
AlexTheCoder
0668e31710 Implement various events to interact with the GUIs and update them when changes to communities or playerdata occur 2016-12-21 19:30:26 -07:00
AlexTheCoder
024a58e0fa Create data classes to handle information about join requests and community members, as well as increasing the amount of information held for online players in their MemberData 2016-12-21 19:30:26 -07:00
AlexTheCoder
cefc3344ab Set up redis pub sub commands to transfer communities information across the network 2016-12-21 19:30:26 -07:00
AlexTheCoder
39f2c94718 Update the Communities miniplugin to contain a variety of redis and player interaction 2016-12-21 19:30:26 -07:00
AlexTheCoder
2a971d616c Complete setting up community data class 2016-12-21 19:30:26 -07:00
AlexTheCoder
471ea8942f Create an enum to manage different unlockable MPS themes 2016-12-21 19:30:26 -07:00
AlexTheCoder
216b4fe947 Further set up communities database class 2016-12-21 19:30:26 -07:00
AlexTheCoder
9ba38ffd3b Implement all communities commands 2016-12-21 19:30:26 -07:00
AlexTheCoder
d44a3774db Implement communities GUI system with several pages for community management 2016-12-21 19:30:26 -07:00
AlexTheCoder
f6362676ff Implement more settings for communities 2016-12-21 19:30:26 -07:00
AlexTheCoder
fd30fca035 Remove an unused preference class and convert friends preferences to social preferences so as to add communities preferences in that section 2016-12-21 19:30:26 -07:00
AlexTheCoder
88fc34def4 Implement a setting to configure whether a game type can be the favorite game of a community 2016-12-21 19:30:25 -07:00
AlexTheCoder
482f0e5b2a Implement a method for loading client data from the web server for offline uuids 2016-12-21 19:30:25 -07:00
AlexTheCoder
1a0bd7ffb0 Set up more settings 2016-12-21 19:30:25 -07:00
AlexTheCoder
7b23c1bdd2 Change SQL queries a bit to be more efficient 2016-12-21 19:30:25 -07:00
AlexTheCoder
a2fb0bb491 Implement more backend for communities and add a command base 2016-12-21 19:30:25 -07:00
AlexTheCoder
0007ffc91e More backend for handling community settings 2016-12-21 19:30:25 -07:00
AlexTheCoder
5143a7cd61 Change/Expand redis interaction and community storage, implement chat formatting 2016-12-21 19:30:25 -07:00
AlexTheCoder
ac224e3f68 Initial communities code 2016-12-21 19:30:25 -07:00
LCastr0
dd9729c0f4 and! 2016-12-21 15:55:52 -07:00
LCastr0
e8d698ac37 Fixed eternal taunt 
Added description for taunts
Added eternal taunt description and icon
Removed minestrike chest for now
Removed debug commans permissions
 2016-12-21 15:55:52 -07:00
LCastr0
f2aef9a873 Auto-add item to eternal 2016-12-21 15:55:52 -07:00
LCastr0
dd7f5d7513 Disguise player as skeleton 2016-12-21 15:55:52 -07:00
LCastr0
5102227e94 Added time in ticks where players can't move at the start of the effect 2016-12-21 15:55:52 -07:00
LCastr0
651d0c5966 Changed clocks to be behind player 2016-12-21 15:55:52 -07:00
LCastr0
36801283d7 Added method to disable taunts in certain games 2016-12-21 15:55:52 -07:00
LCastr0
f9c71c481f Fixed taunts, using armorstands instead of items 
Removed minestrike chest (not being released this month)
 2016-12-21 15:55:52 -07:00
LCastr0
69f7f025a1 Added the first taunt! 2016-12-21 15:55:52 -07:00
LCastr0
e940134610 Removed commented code 2016-12-21 15:55:52 -07:00
LCastr0
99cec0de91 Added pages for the Treasure Chest menu! 2016-12-21 15:55:52 -07:00
LCastr0
e50b867184 Javadocs + option to make taunts usable or not during pvp 2016-12-21 15:55:52 -07:00
LCastr0
0af46005e7 Added Taunts :toot: 2016-12-21 15:55:51 -07:00
LCastr0
8f50f0d833 Added Minestrike chests (this time to the right branch) 2016-12-21 15:55:51 -07:00
samczsun
7e2c4c8555 Change thresholds, add notifs, move stuff around 2016-12-21 15:55:51 -07:00
samczsun
7f3bb9671a Change thresholds, add notifs, move stuff around 2016-12-20 15:05:52 -05:00
samczsun
c4c46b6ba2 Add warning if check does not exist 2016-12-20 15:05:26 -05:00
samczsun
fcaf4538bd Handle multiple bans when ranked TWITCH+ 2016-12-20 15:05:26 -05:00
samczsun
63d0481dcf Fix minor bugs 2016-12-20 15:05:26 -05:00
samczsun
2397cdbba7 Add playerinfo metadata 2016-12-20 15:05:26 -05:00
samczsun
b00d9d7bb4 Prevent punishment abuse 2016-12-20 15:05:26 -05:00
samczsun
383c4d3670 More 2016-12-20 15:05:26 -05:00
samczsun
ece4416c2e Metadata 2016-12-20 15:05:26 -05:00
samczsun
77f1f18f27 More metadata 2016-12-20 15:05:01 -05:00
samczsun
994d286abe More logging 2016-12-20 15:05:01 -05:00
samczsun
74f4645828 Ban log 2016-12-20 15:05:01 -05:00
samczsun
6970c3205e AntiHack Logging 2016-12-20 15:05:01 -05:00
samczsun
77da6ac2c2 Remove MAC 2016-12-20 15:05:01 -05:00
LCastr0
df2b0c7e99 Addef fix for dinnerbone morph not opening menus 2016-12-20 17:16:42 -02:00
LCastr0
fd223935c7 Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph 2016-12-19 22:15:32 -02:00
LCastr0
06a05080ed Added YearMonth for Dinnerbone Morph 2016-12-19 22:15:22 -02:00
samczsun
b85bd623f7 Fix not updating skin/tab list 2016-12-19 19:14:28 -05:00
samczsun
eadbb22de9 Dinnerbone Morph with tab list 2016-12-19 17:53:15 -05:00
Sam
9409cbc42c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-19 00:32:53 +00:00
samczsun
a6db0170c6 QA Fixes 2016-12-15 20:48:40 -07:00
samczsun
58761a0478 1.8 blocker 2016-12-15 20:48:40 -07:00
samczsun
8421aad59c Multiversion support (but not used) 2016-12-15 20:48:40 -07:00
samczsun
54f59c6a4d This is not a bribe 2016-12-15 20:48:40 -07:00
samczsun
de3eef462a Add Gingerbread Chest to list of holiday chests 2016-12-15 20:48:39 -07:00
samczsun
6ed6c324ec Update Holiday Cheer Hover 2016-12-15 20:48:39 -07:00
samczsun
d43d82d1ad Update Leveler tier names 2016-12-15 20:48:39 -07:00
samczsun
908df5a4c2 Make Love Potion call event 2016-12-15 20:48:39 -07:00
samczsun
84132588c2 Give bonus for melons 2016-12-15 20:48:39 -07:00
md_5
e107c0a64a Pass SQL connection into nested method to prevent deadlock. 
Discussed with Sam on Slack 11 Dec #general.
 2016-12-15 20:46:42 -07:00
William Burns
337f9e4fd9 Don't display titles to 1.8 clients! 2016-12-15 12:36:32 +00:00
cnr
2ab9bc2c88 Fix Power Play title track's goal 2016-12-15 00:44:31 -07:00
samczsun
fd00644eb8 Finalize Titles 2016-12-14 19:56:27 -07:00
samczsun
4641ed828b Fix faulty scoreboard logic 2016-12-14 19:54:08 -07:00
samczsun
87eaeabd7f Document and clean up StatsManager 2016-12-14 19:52:13 -07:00
samczsun
d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
samczsun
f2fc70f400 Titles 2016-12-14 19:52:13 -07:00
Sam
d0f3aff051 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-10 11:21:20 +00:00
LCastr0
77a1b40bef Fixed illuminated chests having gadgets 2016-12-08 20:46:14 -07:00
cnr
b7e738b4e8 Revert commits from #302 
This reverts commits from the range 062fdd3^..a0beeab

Changes from #302 are on hold until a later date.
 2016-12-08 20:41:46 -07:00
Sam
58613fa77f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-08 19:42:55 +00:00
Sam
b6173c4990 Google Sheets implementation 2016-12-08 19:25:48 +00:00
LCastr0
38345bfc6d Add Infused chests #308 2016-12-07 21:42:44 -06:00
Nate Mortensen
d51d3b2df2 Fix PP-Bizon skin 2016-12-07 13:20:04 -06:00
Nate Mortensen
833c52d0f2 Create Lifetime system for managing Listeners with a defined duration. 
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
 2016-12-07 13:20:04 -06:00
samczsun
3755424b1c Botspam QoL improvements 2016-12-07 13:11:00 -06:00
samczsun
20697982e7 Create Rank ScoreboardTag to fix Name collision 2016-12-07 13:05:54 -06:00
samczsun
9234c7a7d5 Implement AddPunishCommand and RemovePunishCommand 2016-12-07 13:05:54 -06:00
Alexander Meech
3af0fe3bee Add a check for punishment removal permission 2016-12-07 13:05:54 -06:00
Alexander Meech
609d77a4f2 Add a check for whether a player can remove punishments 2016-12-07 13:05:54 -06:00
LCastr0
97ce2d0ae6 Gingerbread Cosmetics 
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
 2016-12-01 23:39:33 -06:00
cnr
fa0e42a918 Revert "Anticheat Logging #299" 
This reverts commit cae9d2f67e.
 2016-12-01 01:59:50 -06:00
LCastr0
e503654114 Added lore and icon for the Santa Morph 2016-12-01 01:54:53 -06:00
LCastr0
420a74a33d Added Santa Morph to the PowerPlay rewards 2016-12-01 01:49:05 -06:00
LCastr0
64949678f8 Added Santa Morph to the menu 
Disabled spawning Baby Zombie Jockey near water
 2016-12-01 01:42:29 -06:00
cnr
cae9d2f67e Anticheat Logging #299 
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
 2016-12-01 01:24:05 -06:00
AlexTheCoder
df741fd394 Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos 2016-12-01 01:22:32 -06:00
AlexTheCoder
df48369e70 Revamp original Pumpkin King morph, add a new Christmas King Morph, and make the Christmas King morph the new reward for Christmas Chaos 2016-12-01 01:22:32 -06:00
AlexTheCoder
72669c7640 Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff 2016-12-01 01:20:18 -06:00
AlexTheCoder
3a7ff872d6 Update Rune Amplifier display to be less confusing 2016-12-01 01:20:18 -06:00
Sam
a7143897a0 Vertical Border and achievements fix 2016-11-30 19:52:27 +00:00
Sam
60c1d747c5 Remove PackMaster Achievement 2016-11-30 17:37:50 +00:00
Sam
bb7191504c UHC Achievements 2016-11-26 00:40:19 +00:00
Shaun Bennett
8ffe76c2d0 Fix Bonus Rewards for Omega/Illumination 2016-11-24 02:41:58 -05:00
Shaun Bennett
192273314f Merge remote-tracking branch 'origin/develop' into develop 
* origin/develop: (37 commits)
  Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager
  Fix SkyWarrior Kit
  Undo my report changes
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group
  Fix HolidayManager being outdated
  Update Enderchest endpoint location
  Setup enderchest API
  QA changes
  More bugs
  ...
 2016-11-24 00:51:46 -05:00
Shaun Bennett
8882bfee5c Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop 
* remotes/origin/develop:
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group

# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2016-11-24 00:48:15 -05:00
Shaun Bennett
b291090ace Undo my report changes 2016-11-24 00:14:56 -05:00
AlexTheCoder
a669ac4105 Add Cake Mount and implement it in Thankful Chest 2016-11-23 23:43:42 -05:00
AlexTheCoder
31fd148487 Use getName() instead of a String 2016-11-23 23:43:42 -05:00
AlexTheCoder
c028edb064 Enable MountChicken with some small modifications and add it to Thankful Chest 2016-11-23 23:43:42 -05:00
AlexTheCoder
cfa5512141 Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward 2016-11-23 23:43:42 -05:00
AlexTheCoder
ca68b59ba2 Remove MCL and OITQP from the stats page 2016-11-23 23:41:10 -05:00
AlexTheCoder
c2de8c35e2 Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI 2016-11-23 23:41:10 -05:00
AlexTheCoder
1bbabe46f7 Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group 2016-11-23 23:41:10 -05:00
Shaun Bennett
15f3b19f8a Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop 
* origin/update/uhc-moppletop:
  Retry CTF proxy fix
  Eternal Giveaway Fixes
  Eternal giveaway refactoring
  Revert: Disable Fated giveaway tools for now
  Eternal Rank

# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2016-11-23 18:11:26 -05:00
Shaun Bennett
e892476ca0 Setup enderchest API 2016-11-22 08:17:24 -05:00
Sam
325c0ab56c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-21 19:13:34 +00:00
Shaun Bennett
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
Shaun Bennett
3d5e61e0f1 Eternal Giveaway Fixes 2016-11-17 21:05:10 -05:00
Shaun Bennett
562d7de1a9 Eternal giveaway refactoring 2016-11-17 21:05:10 -05:00
Shaun Bennett
cdfd030999 Revert: Disable Fated giveaway tools for now 2016-11-17 21:05:10 -05:00
Shaun Bennett
712019b45b Eternal Rank 2016-11-17 21:05:10 -05:00
Shaun Bennett
c080d41dc2 Temp DB fixes 2016-11-17 19:08:32 -05:00
Sam
0ca79f193f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 21:20:28 +00:00
Sam
53b67214fb More bugs 2016-11-17 21:20:00 +00:00
Shaun Bennett
f6a694b4fc Fix Metal Man distribution 2016-11-17 16:18:51 -05:00
Sam
142cf4dd93 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 19:41:47 +00:00
Shaun Bennett
e845f7fca9 Disable Fated giveaway tools for now 2016-11-17 02:13:48 -05:00
LCastr0
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
cnr
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
Shaun Bennett
cbc9aeedc6 Report Feature Improvements (#269) 
Report Feature Improvements
 2016-11-16 22:52:14 -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
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
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
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
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
07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00: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
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
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
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
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
09e5d13b96 PC-1016 Rename column creator to creatorId 2016-10-29 14:27:19 +01:00
samczsun
49c5df6e68 Parties: Check if target is null before inviting 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
e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04: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
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
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
Keir Nellyer
ff8f77f8d1 Rename these variables to make better sense 2016-10-22 23:08:59 +01:00
Keir Nellyer
c6ca976653 PC-1139 Add /chatsnap command 2016-10-22 20:23:31 +01:00