Commit Graph

7934 Commits

Author SHA1 Message Date
Sam
f8080d2663 PC-574
Another fix for the minestrike vanish problem, this one fixes staff
being assigned teams on join.
2016-06-23 22:40:15 +01:00
samczsun
a33b070ae7
Deny placing skulls 2016-06-23 15:34:29 -04:00
LCastr0
c1b7be6363 Fix merge problems 2016-06-23 16:33:20 -03:00
LCastr0
7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0
a441727e09 Freedom update:
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
Shaun Bennett
6e2c751be1 Adjust amplifiers queue message 2016-06-22 21:09:09 -07:00
Shaun Bennett
1ea680cd20 Return to an invisible armor stand name 2016-06-22 21:01:37 -07:00
Shaun Bennett
bcf82ad513 Remove debug messages 2016-06-22 21:00:50 -07:00
Shaun Bennett
761e550d6c Add shards to announcement message 2016-06-22 20:55:27 -07:00
Shaun Bennett
0873efd876 Update more lore text 2016-06-22 20:54:29 -07:00
Shaun Bennett
621d72f541 Fix merge issues, update lore text 2016-06-22 20:51:58 -07:00
Shaun Bennett
249a5c70aa Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett
906e0e0044 Allow API error messages from HTTP 503 2016-06-22 20:31:18 -07:00
samczsun
956cfeac44
Don't recall if player is dead, show UUID for custom items 2016-06-22 21:14:50 -04:00
samczsun
14c6c4215c
Silent chest opening! 2016-06-22 21:12:24 -04:00
samczsun
032b6a77c0
Display UUID for CMod+ 2016-06-22 21:12:24 -04:00
samczsun
2e1bb25b0b
Fix exceptions 2016-06-22 21:12:24 -04:00
Shaun Bennett
e855a866c7 Fix more thanks and booster occurrences 2016-06-22 08:58:27 -07:00
samczsun
d739df8623 UHC is faster now 2016-06-21 22:21:27 -05:00
Sam
0131850fc3 SSM fixes 2016-06-21 20:41:53 +01:00
Shaun Bennett
1c1912b92a Update fountain goals again 2016-06-20 00:52:33 -05:00
Shaun Bennett
73183af9bf Fixing podium npc bug 2016-06-20 00:45:57 -05:00
Shaun Bennett
afc636b7c5 Fix amplifier reward message 2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a Fix a lot more Booster cases 2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608 Amplifier rename, move podium backwards 2016-06-19 19:05:04 -05:00
Sam
a830b5b388 Removal of debug message and compilation error 2016-06-19 17:12:58 +01:00
Sam
e8b8a3cd66 PC-504
Fixes an issue where if players in SSM destroyed all of the spawn point
locations, players would not be handled correctly
2016-06-19 17:10:22 +01:00
Shaun Bennett
38058bc670 Confirmation Paging 2016-06-19 05:49:32 -05:00
TadahTech
d572635e99 Fix spelling mistake 2016-06-19 02:19:33 -05:00
TadahTech
5316dfe0c6 Remove Spammy "Loaded default kit message".
Fixed SSM kits not closing the GUI when the central item is clicked.
Fixed Smash Crystals being carried over into the next game.
2016-06-19 02:09:17 -05:00
xXVevzZXx
95649a5f14 adjust amount of gems as win reward 2016-06-18 20:48:55 -05:00
Shaun Bennett
a8e67eda88 Rename tip message PC-566 2016-06-18 14:45:39 -05:00
Shaun Bennett
2f0a559441 Add reload command, change podium to lime dye, change tip message 2016-06-18 14:41:32 -05:00
Shaun Bennett
690c6160b9 Green Armor 2016-06-18 14:27:53 -05:00
Sam
d167f93486 PC-507
Fixes an issue where Blaze's "Firefly" and "Phoenix" abilities did no
damage or knockback.
2016-06-18 15:33:39 +01:00
Sam
c19af4e1c5 PC-505
Fixed an issue where players could hit team members with Bouncy Bacon
and get the health bonus from it.
2016-06-18 00:04:03 +01:00
Sam
09957c203b PC-506
Fixes an issue where the creeper's passive in SSM would activate when
they took starvation damage.
2016-06-17 22:24:46 +01:00
Shaun Bennett
5f9a57b7e2 Lower booster tip cooldown to 1 minute 2016-06-17 16:10:01 -05:00
Shaun Bennett
4e3062f413 Swap Cosmetic and Booster interface slot 2016-06-17 15:23:53 -05:00
Sam
35b00679e0 PC-516
When out of leaps in dragon escape there is no longer the "You can now
use Leap" message.
2016-06-17 18:08:37 +01:00
Sam
cbca7e9f7e PC-540
Fixed unneeded messages
2016-06-17 12:06:56 +01:00
Sam
63c2f5c855 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-17 12:06:17 +01:00
TadahTech
d16f83af00 Attempt to fix duplicate messages bug. I cannot reproduce in testing. 2016-06-16 21:12:17 -05:00
cnr
16f6d75dea Revert kit name changes
We can change this back whenever we've migrated to the new name in mssql
2016-06-16 20:36:33 -05:00
TadahTech
3dc93e5c8f Fix rare GUI reported bug. 2016-06-16 19:46:31 -05:00
TadahTech
2e0965a064 Fix Infestor kit
Fix rare occurrence of players getting a GUI they shouldn't (reported)
2016-06-16 19:45:36 -05:00
TadahTech
e28d411ee4 Fix evolution not progression.
Fixed incorrect description in Gladiators
Reformatted kits in Bridges
2016-06-16 18:39:37 -05:00
Sam
a20ae6b58d PC-540
Fixes an issue where players could lose water blocks in Speed builders.
2016-06-17 00:31:32 +01:00
Sam
79085c1ecf PC-541
Fixes an issue where glowing redstone ore would not be counted if the
expected block was redstone ore.
2016-06-17 00:26:24 +01:00
Sam
3f62dd49ef Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-16 23:40:19 +01:00