Commit Graph

7193 Commits

Author SHA1 Message Date
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
Joseph Prezioso Jr. 4a4e64a3ff EloRepository overhaul started
Tinkering with EloRepository, using AccountRepository as a base
2016-04-14 20:09:09 -04:00
Jonathan Williams 64d5f91e8f Remove TeamInvite table. 2016-04-14 18:49:20 -05:00
Ben 0a32eed15d Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular. 2016-04-15 00:43:55 +01:00
Joseph Prezioso Jr. 742807d80e Added generatePlayerElos and updated saveDivision
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
2016-04-14 17:17:26 -04:00
Joseph Prezioso Jr. eb67c12108 Added getRepoElo to EloRepository
Added Bukkit.broadcastMessage() calls to test code

Methods that needed to throw SQLExceptions now throw SQLExceptions
2016-04-14 15:21:28 -04:00
Jonathan Williams 3a26225ce2 Finished main tournament calendar UI.
Added registration for tournaments.
2016-04-14 12:21:24 -05:00
phobia 29b3f03abf Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-14 21:38:48 +10:00
phobia cbc6689782 Disable /kill in tutorial and reset food level after hold position 2016-04-14 21:38:37 +10:00
Ben eab76fefa2 Fix Cannons sometimes glitching out when the owner's clan is deleted. 2016-04-14 12:09:42 +01:00
Ben 3bf3eba005 Completely cancel the explosion falling block for claimed territories. 2016-04-14 12:08:54 +01:00
Ben a295cade1c Fix Cannon TNT sometimes breaking blocks in protected regions 2016-04-14 11:35:12 +01: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
Joseph Prezioso Jr. 9e8a7b582b Elo updates
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF

Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
2016-04-13 18:35:56 -04: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
William Burns b54da22dd8 Create a basic site design for potential job applicants. 2016-04-13 21:06:47 +01:00
Ben 7cc0583d8e Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-13 19:52:49 +01:00
Ben 355ab06e6c Fix the Conquering attribute working for player attacks as well 2016-04-13 13:08:04 +01:00
Ben a26403f006 Fix Recall & Smokebomb not working regularly 2016-04-13 13:04:43 +01:00
cnr 6428dfd723 Run clan-load callbacks on the main thread
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
2016-04-12 22:54:20 -05:00
Ben e9d05474f8 Prevent cannons from changing bedrock into charred blocks 2016-04-12 17:14:48 +01:00
Ben c0ebae4175 Ender chest blocker not actually canceling the opening event. 2016-04-12 17:13:03 +01:00
phobia 11d92c49ec Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-12 09:48:59 +10:00
Ben eefed175ec Add the random world event command. 2016-04-11 18:07:11 +01:00
Ben b313bc5308 Make undead chests not show the 'you are not permitted to use ender chest' messages. 2016-04-10 16:52:54 +01:00
Ben 313b59d1d6 Fix the terrain finder miscalculating the size of undead camps 2016-04-10 16:51:42 +01:00
Ben e014f4fff9 Fix null pointer in the tutorial when using /tutorial finish 2016-04-10 16:51:12 +01:00
Ben 159a5403ac Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug) 2016-04-10 16:47:46 +01:00
Ben db8ca31567 Fix Meridian Scepter not being perfectly accurate. 2016-04-10 16:16:53 +01:00
Ben 0ac9747df1 Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed. 2016-04-10 15:27:20 +01:00
Ben 9a2f4a8936 Fix Meridian Scepter not damaging the victim (would just give the wither effect) 2016-04-10 15:23:43 +01:00
Ben fe89a5b68e Fix the Recall rare item duplication bug 2016-04-10 14:50:00 +01:00
Ben 67a36dc7e4 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-10 12:56:30 +01:00
Ben 66274188c8 Add a /we random command to spawn a random world event 2016-04-10 12:56:00 +01:00
Ben 37bb64bffd Fix Undead Camps from spawning outside of the World Border. 2016-04-10 12:47:56 +01:00
Ben 3ee1f86841 Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff. 2016-04-10 12:36:31 +01:00
Ben 8ee2c02dd9 Disable the use of Ender Chests 2016-04-10 11:20:51 +01:00
Ben e8e73306be Change the Giant's Broadswords regeneration effect level from 41 to 3 2016-04-10 11:15:43 +01:00
Ben dd3e009413 Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests 2016-04-10 10:53:07 +01:00
Conrad S ccf9d4a4c2 Merge remote-tracking branch 'origin/clans/beta' into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-04-09 13:01:04 -04:00
Ben 4bf19eebad Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-09 00:37:40 +01:00
Ben 92195a12d2 Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues.
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
2016-04-09 00:37:20 +01:00
Ben 6e9ae04118 Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32 2016-04-09 00:27:24 +01:00
Keir Nellyer 8b6b3db412
Remove old pre-mavenisation files 2016-04-09 00:17:58 +01:00
Keir Nellyer 6efb8d806d
Re-enable category threshold check
This was disabled for testing reasons.
2016-04-09 00:02:59 +01:00
Conrad S 05b31725a8 Fix initialization NPE. 2016-04-08 18:48:16 -04:00
Ben a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
Conrad S 8a2efa2f0b Make sure a user has enough gold to make a purchase. 2016-04-08 10:48:55 -04:00
Ben 79a2ef3608 Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.) 2016-04-07 22:24:47 +01:00
Joseph Prezioso Jr. 59001bdef6 Fix merge-related errors
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
Ben 2c05743f62 Stop using static with Siege Manager 2016-04-07 21:01:25 +01:00
Keir Nellyer 36e79a1504 Add header to every class as per new coding standards. 2016-04-07 14:44:27 +01:00
Keir Nellyer 390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01: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
Joseph Prezioso Jr 91e550bdcc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr a07e71ba08 GameOption takes a generic value to eliminate the need for more than the one GameOption class.
Remove the--now unnecessary--classes that inherited from GameOption.

Consequently, the creation and implementation of GameOptions should be much more efficient.

Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.

The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr f030f78f08 Add headers to new classes, so as to comply with coding standards.
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
Ben d75d63a81a some missing files and blacklist barrier block from block toss 2016-04-06 18:26:56 +01:00
Jonathan Williams 8b42de03cb Debug messages for PoisonShock 2016-04-06 10:39:00 -05: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
Joseph Prezioso Jr 09db5a8131 I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -04:00
Joseph Prezioso Jr c6c52885a9 Fixed commit 2016-04-05 15:16:40 -04: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
phobia b0dd51843b Ride horse delay 2016-04-05 10:58:31 +10:00
Ben 7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Jonathan Williams cd5ad89f51 Made clans sort by server number. 2016-04-04 17:46:51 -05:00
Jonathan Williams 53b25e6ee0 Fixed diamonds not selling in shops. 2016-04-04 17:46:35 -05:00
Jonathan Williams 6558b16004 Fixed endless loop crash bug with Gear attributes. 2016-04-04 17:46:22 -05:00
Jonathan Williams 8ea0051181 Fixed customer support menu not showing if monthly bonus hasn't been claimed. 2016-04-04 17:46:03 -05:00
Jonathan Williams 2d296d9226 Removed debug ResourcePack Message 2016-04-04 17:45:34 -05:00
Jonathan Williams efa18d394b Fixed Incognito not saving status. 2016-04-04 17:45:10 -05:00
Jonathan Williams 2fa0787792 Clans now load, added connection property to null zero date timestamps. 2016-04-04 16:31:37 -05:00
Jonathan Williams 2b3e466469 Removed pesky '?' causing login query to stall. 2016-04-04 16:30:57 -05:00
Ben 7de23216f6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 20:41:10 +01:00
Ben b3b72f1ca0 commenting out clans bans 2016-04-04 20:40:58 +01:00
Jonathan Williams 02459c6a10 Fixed bad implementation of IncognitoManager that was locking up threads.
Temporarily disabled MessageManager's handling of Incognito.
2016-04-04 13:48:26 -05:00
Jonathan Williams 60010f90b4 Load simple clan token on player login to reduce overhead.
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
Jonathan Williams a91ef68978 Fixed CCM in WarPointEvasion.
Removed debug message; NOT RIDER
2016-04-04 13:46:39 -05:00
Jonathan Williams e2baf2b56c Updated Clans to use the new ResourcePackManager.setResourcePack method. 2016-04-04 13:46:00 -05:00
Jonathan Williams 1b1e6f6ef5 Moved the redis operation before asking for a mysql connection 2016-04-04 13:45:20 -05:00
Jonathan Williams 781c4bfdbd Removed db call off main thread for ClanServerPage 2016-04-04 10:31:13 -05:00
Jonathan Williams 91ddac9643 Added world checking for boundary stuff. 2016-04-04 10:30:59 -05:00
Jonathan Williams e8da5ca0f2 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 10:02:01 -05:00
Jonathan Williams 228a001696 Added Shift Left clicking to the ban list for Cannon :D 2016-04-04 10:01:50 -05:00
Shaun Bennett ff929a8515 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 00:57:28 +10:00
Ben 14207c2073 clansbans 2016-04-04 14:56:20 +01:00
Ben 8330ef560d not rider spam 2016-04-04 14:55:47 +01:00
Shaun Bennett fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Ben 02cb0e1f7e Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-04 13:52:44 +01:00
Ben 1dde17b9cc shooters still shotting fix 2016-04-04 13:51:05 +01:00
phobia e85a1e6a3b fixes to breakingand placing in claim 2016-04-04 22:22:07 +10:00
phobia 4262a4d4b7 Increase radius + delete iron doors after done 2016-04-04 22:07:58 +10:00
phobia 963bba06f7 fix for displaying territorial movements 2016-04-04 17:47:58 +10:00
phobia 2e0c9d3965 Remove potatoe message 2016-04-04 17:34:39 +10:00
phobia aaccb6fd48 Join/leave/death messages 2016-04-04 17:20:21 +10:00
Shaun Bennett 15c4b2dd58 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 17:11:15 +10:00
Shaun Bennett 23e116f9b5 Region fixes 2016-04-04 17:10:52 +10:00
phobia 56a087612b Changes to explain energy goal 2016-04-04 16:58:16 +10:00
Shaun Bennett be8ed78caa Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 16:46:17 +10:00
Shaun Bennett 02f774ce94 A lot of bug fixes 2016-04-04 16:45:20 +10:00
Jonathan Williams 85fabd525a Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 00:59:25 -05:00
Jonathan Williams 400d2f0cca Added bonus log view for customer support. 2016-04-04 00:59:13 -05:00
Shaun Bennett 543719b95d More tutorial fixes 2016-04-04 14:47:33 +10:00
Cheese 040026724b renamed tutorials 2016-04-04 14:10:26 +10:00
Cheese 29bcd6aeea more text cahnges 2016-04-04 13:30:15 +10:00
Cheese 88e56f2ffb Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
2016-04-04 13:03:24 +10:00
Cheese 6c92b42335 text changes 2016-04-04 13:01:54 +10:00
Shaun Bennett 29f2442be8 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 12:53:07 +10:00
Shaun Bennett 8dee8eab0a Bug fixes 2016-04-04 12:52:52 +10:00
phobia 3173adca53 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 12:49:00 +10:00
phobia 5ad877f864 So many fixes <3 2016-04-04 12:47:23 +10:00
Shaun Bennett 0a39b7b756 Fix objective ordering 2016-04-04 12:36:47 +10:00
Shaun Bennett e11a9379b9 More tutorial tweaking 2016-04-04 12:32:22 +10:00
phobia 5195e4a13d Message fixes 2016-04-04 10:15:15 +10:00
phobia c3a119cfe4 Display completion only to player who completes 2016-04-04 10:11:26 +10:00
Ben a1f284670a make zombie npcs actually look at the player 2016-04-03 23:49:22 +01:00
Ben 3ff5e6d337 npc fixes 2016-04-03 18:47:31 +01:00
Ben 7558bd01b7 ensure zombies don't burn to death, by losing equipment 2016-04-03 18:29:13 +01:00
Ben 40361acc9b fixed cannon becoming off-center 2016-04-03 17:51:56 +01:00
Ben ccdd1f901f cannon 1.9 fixes 2016-04-03 17:23:55 +01:00
Ben f4d4b5c5df siege weapon interaction fix 2016-04-03 14:08:40 +01:00
Ben 66a18dcc87 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-03 13:55:17 +01:00
Ben c1b659e738 npcs on enemy base 2016-04-03 13:50:11 +01:00
Ben f5623f00f9 blacklist npe fix 2016-04-03 13:47:57 +01:00
phobia 3ae347653a Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-03 21:33:13 +10:00
phobia c92d291e96 Shift clicking TNT into the cannon + iron doors fixed 2016-04-03 21:32:56 +10:00
Jonathan Williams 8f58a456b1 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-03 01:37:40 -05:00
Jonathan Williams 401127caa9 Reworked Monthly bonuses so they always succeed and it logs them. 2016-04-03 01:36:30 -05:00
phobia 759911396a More clans bug fixes + message tweaks 2016-04-03 16:11:47 +10:00
phobia 5e41c22fc7 - The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective
- Need a congrats message/title when tutorial is completed
- Force user to claim via gui
2016-04-03 13:39:32 +10:00
phobia 45cbeef83d - /c sethome shows the wrong message when the bed can't be placed 2016-04-03 13:32:49 +10:00
phobia 9f4a2ff7ce - Shift clicking TNT into the cannon does not work
- /c map doesn't work in tutorial (could just remove /c map completely)
2016-04-03 13:31:13 +10:00
phobia 664d8b1a4e Fixes for clans tutorial 2016-04-03 11:04:57 +10:00
phobia b4cfbebf3f Fix issue with seeling potatoes 2016-04-02 22:53:41 +11:00
phobia d4e9f638da Fixed a crash bug with title message being too long + other fixes 2016-04-02 22:26:21 +11:00
phobia cc09bf6b51 Fixes to Bull Charge + Adding more instructins to purchasing 2016-04-02 21:43:33 +11:00
William Burns 15cf7f574d Fix join/quit messages. 2016-04-02 11:08:40 +01:00
William Burns 6072753624 Fix shop objective description. 2016-04-02 10:50:46 +01:00
Shaun Bennett b960925522 Fixes 2016-04-02 20:42:41 +11:00
phobia 5a31be1138 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-02 20:33:09 +11:00
phobia 673dd327ff Push for shaun Fireworks 2016-04-02 20:29:56 +11:00
Jonathan Williams e4b2492b35 Fixed ObjectiveGoal's finish from creating CCMs. 2016-04-02 03:03:17 -05:00
Jonathan Williams ff41ad248a Removed PvpTimer
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
Jonathan Williams a6710280fb Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-02 00:45:10 -05:00
Jonathan Williams 01d9c1cd09 Finished the <?> for Objective and ObjectiveGoal. 2016-04-02 00:45:01 -05:00
Shaun Bennett d161d83d12 Maps and other various fixes 2016-04-02 15:43:03 +11:00
Shaun Bennett 5739b1b87b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 15:13:16 +11:00
Jonathan Williams 3bc1908b57 Fix player quit staying in _active list for Objectives. 2016-04-01 23:10:15 -05:00
Shaun Bennett 758004f207 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 14:55:14 +11:00
Jonathan Williams fa6d18b0fa Fix sync db call inside sendMessage 2016-04-01 22:43:09 -05:00
Cheese 8f959a73eb debug 2016-04-02 12:46:25 +11:00
Cheese 9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Shaun Bennett 0abcd0044b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 10:53:28 +11:00
Joseph Prezioso Jr 6e23a17acb Removed unnecessary code. 2016-04-01 16:01:57 -04:00
phobia 90e336b18e Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-01 21:51:51 +11:00
phobia 42fd210b20 PC-56 2016-04-01 21:51:31 +11:00
Jonathan Williams fe41e79e8a Fixes:
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
2016-04-01 01:55:08 -05:00
phobia 9a1e5099a4 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-01 14:04:12 +11:00
phobia d0bc40b991 PC-56 and PC-65 2016-04-01 14:01:38 +11:00
Shaun Bennett 49441cfaf4 PC-63 and PC-64 2016-04-01 10:47:21 +11:00
Ben 3412082f37 PC-61 - Remove all diamonds from inventory after sell diamonds objective 2016-04-01 00:33:42 +01:00
Ben da99a12b23 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 20:03:50 +01:00
Ben d353c53524 remove hard-coded access to certain commands for my uuid/name 2016-03-31 20:03:25 +01:00
Joseph Prezioso Jr 5e1003cccb Missed a minus sign in my previous commit. 2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr 6ccc6df6aa Elo calculations now account for player's Elo, relative to the average Elo among players 2016-03-31 13:57:21 -04:00
William Burns 4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr cbb9798c35 Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd. 2016-03-31 12:49:22 -04:00
phobia 19b2b00a13 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 20:35:40 +11:00
phobia 86bdbbb8bc PC-46 + adding in events for buttons 2016-03-31 20:35:21 +11:00
Shaun Bennett 682c365bc6 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-31 20:09:16 +11:00
Shaun Bennett b3392e78f5 PC-28 - Improve Flow of Tutorials 2016-03-31 20:08:45 +11:00
AlexTheCoder 4ae4f056ea - Map Polish 2016-03-31 03:46:43 -04:00
AlexTheCoder 40175db217 - Lots of polish 2016-03-31 03:41:07 -04:00
Shaun Bennett 30a098c645 PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial). 2016-03-31 18:24:47 +11:00
Shaun Bennett 7c70092f3b PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island 2016-03-31 18:19:06 +11:00
Shaun Bennett e7b9d866ae PC-57 - Rename Identify Fields to Identify Fields on Map 2016-03-31 17:10:56 +11:00
Shaun Bennett c51830145e PC-58 - Close gate to the fields after you sell diamonds 2016-03-31 17:09:51 +11:00
Shaun Bennett f229da1327 PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes" 2016-03-31 17:08:26 +11:00
Shaun Bennett 25975e47b8 PC-54 - Rename Identify Shops to Identify Shops on Map 2016-03-31 17:07:08 +11:00
Shaun Bennett 7867da277d PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map 2016-03-31 17:05:59 +11:00
Shaun Bennett 50518250de PC-51 - Rename randomClan to EnemyClan 2016-03-31 17:02:38 +11:00