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

8530 Commits

Author SHA1 Message Date
Sam
950a46ad12 Fix Throwable Dirt's velocity 2016-08-09 14:06:39 +01:00
AlexTheCoder
e5a96e8189 Fix incorrect casing in mapping outposts 2016-08-08 21:54:27 -04:00
Sam
4c825cf80b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-08 22:48:33 +01:00
Sam
3bab7ffe44 Use attack name for Snowballs and Eggs 2016-08-08 22:48:13 +01:00
Sam
93e49bc8a6 Stop placing and dropping of skill items 2016-08-08 16:44:13 +01:00
cnr
4180f03a52 Use the correct SalesPackageBase for gadgets 2016-08-07 22:40:26 -04:00
AlexTheCoder
5a2871528f Small aesthetic change to ghasts 2016-08-07 18:53:35 -04:00
AlexTheCoder
73cb42c7ab Make outposts actually end after they expire 2016-08-07 18:53:23 -04:00
AlexTheCoder
cce871b0e2 Stop runes being applied to stacks of items 2016-08-07 18:53:05 -04:00
AlexTheCoder
4e8ed68efd Stop bows from selling in stacks 2016-08-07 18:52:48 -04:00
AlexTheCoder
36e6c7ce33 Fix slight error in amplifier end messages 2016-08-07 18:52:21 -04:00
AlexTheCoder
e16d88e52b Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode 2016-08-07 18:52:00 -04:00
AlexTheCoder
5985731909 Make block drop rate 30% like normal TNT 2016-08-07 17:55:38 -04:00
AlexTheCoder
36aa1f9317 Stop swords and bows from being sold in stacks 2016-08-07 15:02:23 -04:00
AlexTheCoder
95302177f8 Add cooldowns to all gui items tied to giving rewards to prevent some exploitation 2016-08-07 14:47:14 -04:00
Sam
280ff577fa Metal Kit skill item placing and dropping 2016-08-07 01:25:48 +01:00
Sam
44274bcc64 Projectiles, Enchanted armor & StackOverFlows 
Fixes an issue where players with enchanted armor would cause the server
to frezze for an extended amount of time due to a stackoverflow error
when hit by projectiles such as snowballs or eggs.
 2016-08-07 01:23:03 +01:00
AlexTheCoder
c5d979e5dc Remove unnecessary while loop 2016-08-06 03:08:29 -04:00
AlexTheCoder
8eb74de2e8 Make outposts not try to block all right clicking everywhere -.- 2016-08-05 21:34:31 -04:00
AlexTheCoder
4e0971ab0a Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-08-05 14:35:57 -04:00
AlexTheCoder
5b03692c97 Add in cooldowns for other clans shop buttons to stop autoclick exploits 2016-08-05 14:33:59 -04:00
AlexTheCoder
599c47a8c2 Prevent stacks of runes being consumed on one item 2016-08-05 14:33:21 -04:00
AlexTheCoder
a56f72b6af Unify standard for event spawn points 2016-08-05 14:32:30 -04:00
AlexTheCoder
4637bc8531 Prevent war times from displaying as negative 2016-08-05 14:31:13 -04:00
AlexTheCoder
223fb0e526 Use custom explosion calculations as opposed to default mineplex explosion handling 2016-08-05 14:30:00 -04:00
AlexTheCoder
d73ced0e87 Stop portals from spawning in mid-air 2016-08-05 14:28:49 -04:00
AlexTheCoder
6170f9df87 Actually enable create button by removing stray '!' 2016-08-05 14:27:07 -04:00
AlexTheCoder
027b6b3fc4 Prevent players from using /c home after recently being in combat 2016-08-05 14:25:47 -04:00
AlexTheCoder
ce6a0b376c Prevent players using the gui to bypass join cooldowns 2016-08-05 14:24:56 -04:00
AlexTheCoder
e01b57ceac Implement auto restart system for clans servers in off-peak times 2016-08-05 14:24:00 -04:00
AlexTheCoder
ee1f2a7ef9 Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611) 2016-08-05 14:22:17 -04:00
AlexTheCoder
1ab5c8229b Make bosses clean up after themselves and be more error-resistant 2016-08-05 13:40:05 -04:00
AlexTheCoder
14f140143b Re-enable music in hub gadgets 2016-08-05 13:34:33 -04:00
AlexTheCoder
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
cnr
0ca4fe2d38 Disable MAC kick for suspicious movement 2016-08-04 12:41:59 -04:00
Sam
23b7064d43 Island ores bug 2016-08-04 16:56:13 +01:00
Sam
190ced7d97 Metal Kit tweaks 2016-08-04 16:55:52 +01:00
xXVevzZXx
91cf391724 some adjustments to UHC Survivalgames 2016-08-04 00:33:24 -04:00
cnr
3610f78b37 Merge branch 'feature/thanks' into develop 2016-08-03 22:23:46 -04:00
Shaun Bennett
85c4c181ec Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl 2016-08-03 18:22:36 -05:00
Shaun Bennett
e113bedea5 Fix accidentally refactoring "thanks" in strings 2016-08-03 15:11:31 -05:00
Shaun Bennett
72f078fe54 Fix using wrong name, add missing jooq files 2016-08-03 15:04:06 -05:00
Shaun Bennett
6d93efc1a2 Adjust button text as well 2016-08-03 14:57:30 -05:00
Shaun Bennett
ad6c1dd970 Adjust some text wording 2016-08-03 14:55:33 -05:00
Shaun Bennett
2e80838376 Update ClaimTips lore 2016-08-03 14:25:07 -05:00
Shaun Bennett
a61906acfa Ignore "Testing" boostergroup when announcing activation 2016-08-03 14:24:49 -05:00
Shaun Bennett
ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett
1ae7f6cb25 Integrate the new ThankManager into Amplifiers 2016-08-03 14:03:12 -05:00
cnr
3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder
fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
Sam
2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
Shaun Bennett
f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
md_5
dad453bd84 Remove Sentry - Unused 2016-08-02 11:42:16 +10:00
Sam
62a1968b01 Experimental Metal Kit 2016-08-02 01:13:16 +01:00
AlexTheCoder
4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
Sam
2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +01:00
AlexTheCoder
cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder
d12d353c20 Fix pronoun in message autoreply 2016-07-30 17:36:03 -04:00
AlexTheCoder
2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder
fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder
d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
AlexTheCoder
9e2ba8c653 Fix fissure applying to anvils 2016-07-30 09:36:38 -04:00
AlexTheCoder
ecb56bf450 Fix players being able to use de-blink to teleport between worlds 2016-07-29 13:35:09 -04:00
AlexTheCoder
96e0625548 Fix mislabeling of shop item in user display 2016-07-29 03:15:22 -04:00
cnr
d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
TadahTech
9529789159 Remove 3 second chat delay. 2016-07-28 22:54:04 -05:00
AlexTheCoder
62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
cnr
8d0dc0ce08 Merge branch 'feature/party-v2' into develop 2016-07-28 21:19:52 -05:00
AlexTheCoder
f53503f16a Move code in sync runnable 2016-07-28 21:07:29 -04:00
AlexTheCoder
dddfb4420c Fix players being allowed to recall through worlds 2016-07-28 21:05:25 -04:00
AlexTheCoder
841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder
16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder
97d5d21a55 Fix lightning orb duping 2016-07-28 19:43:43 -04:00
AlexTheCoder
853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder
3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
AlexTheCoder
47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
AlexTheCoder
f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
cnr
a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
Shaun Bennett
9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
AlexTheCoder
f0be7794f5 Lower skeleton king passive rate 2016-07-28 06:16:20 -04:00
AlexTheCoder
4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder
c30d30b2e7 Fixes event mobs getting stuck outside 2016-07-28 05:33:37 -04:00
TadahTech
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
AlexTheCoder
639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder
aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder
b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
AlexTheCoder
d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr
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
Sam
00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx
749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
cnr
646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00
AlexTheCoder
62871686b0 Update clans store items to currency changes 2016-07-27 16:57:07 -04:00
cnr
dfbebe11f4 Use separate gold balances for each clans server 2016-07-27 15:52:07 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
AlexTheCoder
6180bea5cc Update clans drop aesthetics and spawn/shop locations 2016-07-27 15:07:11 -04:00
xXVevzZXx
43c45f4094 add timer to dragon escape 2016-07-27 13:59:35 -05:00
Sam
8648581140 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-27 19:57:25 +01:00
cnr
167c0f2b5e Reimplement EnergyShopButton with new machinery 2016-07-27 13:52:03 -05:00
cnr
3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
cnr
dc96258055 Merge branch 'feature/party-v2' into develop 2016-07-27 13:19:25 -05:00
Shaun Bennett
0d46bc4609 Add Amplifier thank button 2016-07-27 13:17:36 -05:00
xGamingDudex
72b5507390 Fixed PC-120 2016-07-27 12:29:07 +02:00
xGamingDudex
161381f393 Fixed PC-698 2016-07-27 12:09:59 +02:00
AlexTheCoder
157c969e8d Completely prevent players in parties from joining Clans servers 2016-07-27 05:51:49 -04:00
AlexTheCoder
d162750aec Keep nether loaded if its not empty 2016-07-27 04:47:03 -04:00
AlexTheCoder
ea3cb36d3a Clean up miniboss mobs after their chunk unloads 2016-07-27 04:43:00 -04:00
AlexTheCoder
85cf005eba Small clans economy changes 2016-07-26 22:33:19 -04:00
AlexTheCoder
9c700425fd More javadocs 2016-07-26 22:32:46 -04:00
AlexTheCoder
d98ca0ab3c Remove unused miniboss 2016-07-26 09:00:37 -04:00
AlexTheCoder
bb5d766ba6 Patch war point evasion by committing suicide in safezones 2016-07-26 07:35:11 -04:00
AlexTheCoder
34d5fb5e24 Fix craters getting glitched in wilderness 2016-07-26 07:15:40 -04:00
AlexTheCoder
e396acc69c Fix clans ips being added to the bungee rotator 2016-07-26 07:15:09 -04:00
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
AlexTheCoder
55c63364f2 Fix KOTH starting in other hub worlds and hub basketball teams always being null 2016-07-21 16:57:24 -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
AlexTheCoder
286a7aa32a Even more debug 2016-07-21 16:16:38 -04:00
AlexTheCoder
4a77a587f8 Fix git removing a class 2016-07-21 16:11:05 -04:00
AlexTheCoder
b5ce35544f Fix merge conflict 2016-07-21 15:48:56 -04:00
AlexTheCoder
fc3ceddf4d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-07-21 15:47:59 -04:00
AlexTheCoder
97ef408e14 Debug 2016-07-21 15:46:48 -04:00
Shaun Bennett
9ed0bbe43a Fix NPC's for unloaded worlds 2016-07-21 14:22:38 -05:00