Commit Graph

7057 Commits

Author SHA1 Message Date
AlexTheCoder
e55bec505b - Fix players ending up teleported back to arena due to broken respawn engine 2016-04-21 20:13:39 -04:00
AlexTheCoder
df55d48ab8 - Looks better 2016-04-21 01:03:14 -04:00
AlexTheCoder
d57cc48f0f - Added new features! 2016-04-20 22:31:54 -04:00
AlexTheCoder
588e6f08c2 - Removed TypeWars achievements to make room 2016-04-19 18:07:20 -04:00
AlexTheCoder
e08965aa25 - Fixed TowerDefender being too difficult to obtain
- Fixed wither attacking own towers by accident
2016-04-18 22:58:55 -04:00
AlexTheCoder
6c20427395 - Fixed some bugs and added final achievements 2016-04-18 22:32:15 -04:00
AlexTheCoder
17ac3cb597 - Fix armor checking
- Edit wither death message
2016-04-18 20:29:53 -04:00
AlexTheCoder
10aba533f3 - Remove all dependence on UtilShapes 2016-04-18 19:59:55 -04:00
AlexTheCoder
34399db6e8 - Fixed missing GameType 2016-04-18 18:42:56 -04:00
AlexTheCoder
d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0 - More polish and bugfixes 2016-04-16 23:59:44 -04:00
Shaun Bennett
4477a215f4 Update to Redis 2.8.1 and clean up repositories (#26) 2016-04-16 22:51:20 -05:00
AlexTheCoder
35d7dd8b44 - Fixed stuff 2016-04-16 20:36:19 -04:00
AlexTheCoder
b0d30a4ff4 - cleaned everything up
- renamed game
2016-04-16 20:32:14 -04:00
AlexTheCoder
d8f5ac66fc - More chiss 2016-04-16 14:05:46 -04:00
Jonathan Williams
a730b81feb Commented out TournamentManager, moving off develop. 2016-04-15 12:38:25 -05:00
Jonathan Williams
b43953439e Properly store teamId locally after registering for tournament.
Use team id when unregistering for the tournament.
2016-04-15 12:36:28 -05:00
Jonathan Williams
cf3141ddc0 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-15 12:30:32 -05:00
AlexTheCoder
09f9ae3b7a - Update for playability 2016-04-14 23:05:14 -04:00
AlexTheCoder
33b557eb10 - Huuuuuuuge amount of changes for chiss 2016-04-14 22:45:21 -04:00
Jonathan Williams
64d5f91e8f Remove TeamInvite table. 2016-04-14 18:49:20 -05:00
Jonathan Williams
3a26225ce2 Finished main tournament calendar UI.
Added registration for tournaments.
2016-04-14 12:21:24 -05:00
cnr
ab21efd2ca Give the correct amount of old/ancient chests for bonuses 2016-04-13 18:51:52 -05:00
cnr
6b2f601c7a Prevent a spectator race condition in arcade games
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
2016-04-13 18:20:39 -05:00
cnr
6d01e235fd Fix online friends list
Previously, it was incorrectly asserting that all players were
incognito. If we want to exclude incognito players, we'll have to find a
different way.
2016-04-13 17:24:46 -05:00
Jonathan Williams
85f4ff1299 Starting on Tournaments. 2016-04-13 17:14:48 -05:00
cnr
91c97e38b8 Prevent players from naming their pets "ULTRA"
This was being used to fool support into thinking the player had won
Ultra from a chest
2016-04-13 16:37:13 -05:00
Conrad
67adf94341 Merge pull request #23 from Mineplex-LLC/clans/beta
Clans/beta
2016-04-08 11:07:00 -04:00
Conrad S
8a2efa2f0b Make sure a user has enough gold to make a purchase. 2016-04-08 10:48:55 -04:00
Ben
2c05743f62 Stop using static with Siege Manager 2016-04-07 21:01:25 +01:00
Conrad
e921ccc3e5 Merge pull request #22 from Mineplex-LLC/clans/beta
Add missing events that are causing errors in servers, and disables incognito mode for demoted staff members
2016-04-07 08:06:40 -04:00
Ben
c484a80a14 Remove incorrect import 2016-04-07 08:12:05 +01:00
Ben
b70ff03185 Fix siege weapon crater being spawned at the lowest block at the current collision location.
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
Ben
f2ac2d87bf Remove debug command, that could be very abused 2016-04-07 08:07:18 +01:00
Ben
9ccec50fd0 Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up. 2016-04-07 08:06:16 +01:00
Ben
eed3df720a Disable incognito mode for staff members that have been demoted whilst using it.
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
2016-04-07 07:00:46 +01:00
Ben
3a8ab581dd Add JavaDoc to new classes to comply with the new standards 2016-04-07 06:52:52 +01:00
Ben
d75d63a81a some missing files and blacklist barrier block from block toss 2016-04-06 18:26:56 +01:00
Ben
d25f1abfbf stop iron door from being opened by players not in clan (outpost) 2016-04-05 23:49:16 +01:00
Ben
738825ea9d perms for tutoirial command 2016-04-05 23:37:08 +01:00
Ben
4bdd33c87b blowing holes in the ground and interacting with cannon sometimes not working 2016-04-05 23:15:38 +01:00
Ben
744d8891b4 import 2016-04-05 22:58:03 +01:00
Ben
be63012d18 make trainees+ not count to kicked player count 2016-04-05 12:43:19 +01:00
Ben
876a7a8eb6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-05 12:37:23 +01:00
Ben
cfac41f216 full server trainee+ fix 2016-04-05 12:37:04 +01:00
Jonathan Williams
dd5b2d5e3f Fixed NPE with poison condition effect. 2016-04-05 00:36:18 -05:00
Jonathan Williams
e23362bd6f Fixed NPE in OrderedObjective 2016-04-05 00:36:00 -05:00
Jonathan Williams
b34a175a2b Fixed error in Outpost throwing NPE. 2016-04-05 00:35:44 -05:00
Shaun Bennett
ae87db1742 Fix TNT generator timings 2016-04-05 13:04:52 +10:00
Shaun Bennett
23232efd63 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00