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

3843 Commits

Author SHA1 Message Date
LCastr0
f25c592a6d Removed commented code 2016-12-26 22:20:23 -02:00
LCastr0
78510ffbbf Allows multiple balloons 2016-12-26 22:19:08 -02:00
LCastr0
5e420a20d8 Changed temporary display item so it doesn't bug with 1.11 2016-12-26 20:21:43 -02:00
LCastr0
d19d661c7d Modified pets so they don't make different sounds anymore :toot: 2016-12-26 19:02:35 -02:00
LCastr0
6712ad427b Added bat so players can use items in hand with the leash 
Changed silence method so it works :toot:
 2016-12-26 19:00:11 -02:00
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