Commit Graph

8682 Commits

Author SHA1 Message Date
AlexTheCoder
4df8de58a6 More javadocs 2016-07-26 05:51:42 -04:00
AlexTheCoder
bf5e9f1d76 ADD JAVADOCS TO CLANS 2016-07-26 05:50:43 -04:00
AlexTheCoder
61eca3ced0 Removed auto disguising from clans hub and removed clans tnt protection 2016-07-26 00:54:31 -04:00
AlexTheCoder
7b358adba1 Prevent runed pickaxe from destroying the nether 2016-07-25 20:26:23 -04:00
AlexTheCoder
b41ad2e087 Fix NPC orientation in clans hub 2016-07-25 12:28:25 -04:00
AlexTheCoder
aecaa89443 Update clans hub spawn location 2016-07-25 12:08:37 -04:00
AlexTheCoder
9a73784b7c Make clans in the hub route through clans hubs 2016-07-25 11:18:10 -04:00
AlexTheCoder
a1fd021f8d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-25 10:59:38 -04:00
AlexTheCoder
6f0d21120e Serious tweaks to gameplay and begin documentation 2016-07-25 10:59:03 -04:00
AlexTheCoder
0ecdce4edc Add clans hub to maven 2016-07-25 10:58:32 -04:00
AlexTheCoder
979bb92034 Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration 2016-07-25 10:57:15 -04:00
AlexTheCoder
25b0ae5916 Add support for sending players back to any clans hub via portal 2016-07-25 10:56:30 -04:00
AlexTheCoder
275ab52f79 Create a clans-only hub 2016-07-25 10:55:18 -04:00
AlexTheCoder
9fab8366b7 Add support for clans hub connection inside bungees 2016-07-25 10:52:48 -04:00
TadahTech
5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
TadahTech
a23c2c4e1c Update UI to reflect allowing upgrades to be shown, per kit. 2016-07-24 16:05:19 -05:00
Sam
4728a50ca9 Small message change
Avoids using two variables
2016-07-24 11:49:57 +01:00
TadahTech
ceccf2d2ac Don't give the item when a game is in progress. 2016-07-23 22:36:53 -05:00
TadahTech
133376fb94 Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full. 2016-07-23 19:50:57 -05:00
Sam
50de769e36 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-24 00:13:13 +01:00
Sam
03b3c1864d Map crumble issue
Fixes an issue where the max distance of a map would not be calculated
correctly affecting the map crumble
2016-07-24 00:12:48 +01:00
AlexTheCoder
818ed4c9a9 Set up clans monetization features in the shop and fix some hardcoded names in core 2016-07-22 00:18:34 -04:00
AlexTheCoder
869dfc1dfa Finalize Amplifier system 2016-07-21 20:21:11 -04:00
TadahTech
5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
AlexTheCoder
891a3231d8 Change banner GUI 2016-07-21 17:37:02 -04:00
AlexTheCoder
b87c6cfff0 Fix git removing class 2016-07-21 17:27:41 -04:00
AlexTheCoder
75cc75f40c Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 17:25:15 -04:00
TadahTech
2b8930eee8 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-21 15:32:49 -05:00
TadahTech
d7c5184980 Party fixes and tweaks. 2016-07-21 15:24:48 -05:00
Shaun Bennett
9ed0bbe43a Fix NPC's for unloaded worlds 2016-07-21 14:22:38 -05:00
xXVevzZXx
0262452b6a Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable. 2016-07-21 13:59:35 -05:00
AlexTheCoder
1f2b1557d5 Work on amplifiers and deleting banners when the clan is deleted 2016-07-21 13:20:45 -04:00
Sam
faece2c5f8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-21 11:13:15 +01:00
AlexTheCoder
e5cd38c11b Revert enjin changes 2016-07-21 05:20:47 -04:00
AlexTheCoder
2615ef74dd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 05:09:54 -04:00
AlexTheCoder
1dedde41a8 Banners and beginning javadocs 2016-07-21 05:09:31 -04:00
TadahTech
b48f97fd2e Fix stupid JOOQ issue and IntelliJ. 2016-07-21 03:46:18 -05:00
TadahTech
b734dc4e87 Remove Pay wall for Party sizes 2016-07-21 02:59:15 -05:00
TadahTech
9f0f4e0018 Fix possible cross server invite spamming. 2016-07-21 02:20:02 -05:00
TadahTech
f1b3c4756d Use UUID's instead of playernames. 2016-07-21 02:16:26 -05:00
TadahTech
4cab91f251 Use getPlayerExact. 2016-07-21 02:05:37 -05:00
TadahTech
76ac89266e -sigh- a hotfix.
Won't invite players across servers who are already in parties.
Fix transferring ownership to non-party members
2016-07-21 02:05:10 -05:00
cnr
e7da161f35 Revert "Fixed PC-706"
This reverts commit 96d16be5b7.
2016-07-20 20:07:06 -05:00
cnr
b0f5b536b1 Merge branch 'feature/party-v2' into develop 2016-07-20 18:06:14 -05:00
Shaun Bennett
31d6a2542d Replace runSync call with runAsync 2016-07-20 18:03:01 -05:00
Shaun Bennett
b136372d1b Gem fountain changes; increase goal, link to eu 2016-07-20 18:03:01 -05:00
TadahTech
c3b7a81730 Don't show all buttons in all menus. Protected fields != private fields. 2016-07-20 17:48:24 -05:00
cnr
14e5928b00 Add a pull request template 2016-07-20 17:33:03 -05:00
cnr
9a06cce0a0 Merge branch 'feature/party-v2' into develop 2016-07-20 16:41:50 -05:00
TadahTech
0fc64c45a8 Update JoinResponseReason 2016-07-20 16:33:26 -05:00