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
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
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
