Commit Graph

1409 Commits

Author SHA1 Message Date
samczsun 9acdbd7cbe
Don't allow placing banners and string. Fixes PC-333 2016-05-24 15:38:03 -04:00
Sam Sun 9853ef824e QA Pass #2 - Comment WorldManager, optimize searching 2016-05-24 12:24:14 -05:00
AlexTheCoder b952de856e Add a description for the Magnetic Maul and switch ConcurrentHashMap to HashMap in the Meridian Scepter 2016-05-24 13:15:29 -04:00
samczsun f32e648691 QA Pass #1
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
2016-05-24 13:15:29 -04:00
samczsun 2f993dbe66 Fix Wind Blade, Hyper Axe 2016-05-24 13:15:29 -04:00
samczsun 4ba3148df7 Finish invsee 2016-05-24 13:15:29 -04:00
samczsun ec0e1b9849 New invsee implementation 2016-05-24 13:15:29 -04:00
samczsun 63e3cc8e12 Add nullcheck 2016-05-24 13:15:29 -04:00
samczsun d8b5dba3fc Fix Meridian Scepter 2016-05-24 13:15:29 -04:00
AlexTheCoder 1dc5a0d712 Revamped Meridian Scepter attack 2016-05-24 13:15:29 -04:00
samczsun 981bed5e37 Limit clan searching. Fixes PC-331 2016-05-24 13:15:29 -04:00
samczsun e0f4c9cbc8 Update Broadsword regen 2016-05-24 13:15:29 -04:00
samczsun 41846f835d Bump listener priority, change wording. Fixes PC-308 2016-05-24 13:15:29 -04:00
samczsun c172d226c4 Add bypass for testing servers to skip tutorials 2016-05-24 13:15:29 -04:00
samczsun 08784d3f0a Ignore float kick for Wind Blade. Fixes PC-314 2016-05-24 13:15:29 -04:00
samczsun 786c60537e Remove /c trust from help. Fixes PC-280 2016-05-24 13:15:29 -04:00
Sam Sun cd0e59087a Don't drop items from hidden slimes. Fixes PC-276 2016-05-24 13:15:29 -04:00
samczsun 9141ed645a Fix fissure anvil repair exploit. Fixes PC-312 2016-05-24 13:15:29 -04:00
samczsun ea43dca9af Don't allow placing TNT in tutorial. Fixes PC-307 2016-05-24 13:15:29 -04:00
samczsun d29d5dd5e4 Actually fix PC-279 2016-05-24 13:15:29 -04:00
samczsun 89da8790bf Clans optimizations
Key notes:
* RAM usage decreased on startup
* Startup speed much quicker
* Map is entirely rendered on startup

Details:
Changed TutorialWorldManager Stack -> LinkedList because no need for
synchronization
Documented map methods and magic numbers
Remove loading all chunks on startup
Render map on startup
Optimize map rendering by replacing ArrayList with LinkedList
Optimize map rendering by reading chunk directly from disk and caching to
prevent entity ticking
Optimize map rendering by using a global BlockPosition
Save results for showing zoom
2016-05-24 13:15:29 -04:00
samczsun 7c66c98338 Clean up Farming 2016-05-24 13:15:29 -04:00
samczsun 173a6bb143 Delete IncognitoHidePlayerEvent 2016-05-24 13:15:29 -04:00
samczsun 2675789f59 Compare commands with equals. Fixes PC-116 2016-05-24 13:15:29 -04:00
Shaun Bennett 434ada2e86 Fix merge issues 2016-05-24 19:14:52 +10:00
LCastr0 ed68ef332b Fixes for Win Room (Players were able to see other players)
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
Ben 35c7b9a2bd Incognito Updates:
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
cnr 6042be2d2f Refactor clans ban functionality and remove UtilStreams 2016-05-17 05:57:27 -05:00
cnr f5cf751622 Revert "Temporarily disable clans ban functionality"
This reverts commit b47c49d93b.
2016-05-17 05:51:18 -05:00
samczsun 1fc4239b89 Determine whether Ice Prison target is valid. Fixes PC-281 2016-05-16 15:44:22 -05:00
AlexTheCoder de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
cnr 4aa44cd796 Merge branch 'develop' into clans/beta 2016-05-08 16:53:48 -05:00
cnr b47c49d93b Temporarily disable clans ban functionality
This can be reverted when clans bans are properly audited/fixed/tested.
2016-05-07 19:02:19 -05:00
phobia 38f22b1577 Disable obsidian dropping after breaking THE BLOCK 2016-05-07 19:51:19 +10:00
Keir Nellyer a663cb3e01 Revert "Revert "Report system (version 1)""
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-05-04 15:24:29 +01:00
cnr 57fca2a8d0 Temporarily(?) mitigate spigot CME
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
2016-05-03 04:56:31 -05:00
Ben cd2bd8ac1d Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever. 2016-05-02 11:49:56 +01:00
Ben 8a1b5572a8 Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan. 2016-05-02 10:31:45 +01:00
Ben 026ab15099 Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned. 2016-05-01 23:20:55 +01:00
Ben 480cc0f9be Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand. 2016-05-01 23:04:30 +01:00
Ben e139bea465 Fix kill messages inserting a space below them in chat. 2016-05-01 23:03:18 +01:00
Ben eae972a3e6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 10:11:28 +01:00
Ben 9d97ea8d1e Missing Clans ban cache class (to do with the commit previously by me) 2016-05-01 10:11:17 +01:00
cnr 4cffb39941 Delay dismount teleport by one tick
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
Ben 189f9ad524 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 01:42:32 +01:00
Ben 2337e89a93 Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well. 2016-05-01 01:42:11 +01:00
cnr 8ca38b2598 Prepend http:// to resource pack locations 2016-04-30 18:54:17 -05:00
cnr 10166f063b Merge branch 'develop' into clans/beta 2016-04-30 16:16:57 -05:00
phobia 14204fba5c Changed resource packs to home hosted ones 2016-04-30 16:02:26 -05:00
phobia 890ab9f67e Uncommented ClansBanManager's instances 2016-04-30 16:02:26 -05:00
phobia f1c2e71d56 Some changes to error handlng for clans regions 2016-04-30 16:02:26 -05:00
cnr 634a34dd52 Reintroduce non-Air constraint to cannon explosion 2016-04-30 16:02:26 -05:00
cnr 2eb7b892e0 Refactor cannon explosion effect for clarity 2016-04-30 16:02:26 -05:00
cnr f2f627116a Correctly count cannon explosion effect attempts
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
  territory
2016-04-30 16:02:26 -05:00
Conrad d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Keir Nellyer 6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
Keir Nellyer 81cebc4ce7 Swap static helpers for a much better solution
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.

Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
phobia f63a872bd4 Changed resource packs to home hosted ones 2016-04-29 14:46:14 +10:00
phobia c814fc73f7 Uncommented ClansBanManager's instances 2016-04-29 12:53:20 +10:00
AlexTheCoder b4c5be81f3 - Fixed random weather in MCL
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
Keir Nellyer dab1f9485c Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-04-24 17:17:17 +01:00
phobia b21939444c Some changes to error handlng for clans regions 2016-04-23 16:40:39 +10:00
Jonathan Williams d73b720323 Merge branch 'features/elo' into develop 2016-04-22 04:34:35 -05:00
cnr 4227e24ae0 Reintroduce non-Air constraint to cannon explosion 2016-04-17 16:29:23 -05:00
cnr e375db5aec Refactor cannon explosion effect for clarity 2016-04-17 13:33:44 -05:00
AlexTheCoder ee30012011 Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-17 12:27:23 -04:00
cnr 9c6d23f11e Correctly count cannon explosion effect attempts
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
  territory
2016-04-16 07:31:00 -05:00
cnr 77b6515387 Don't break the repair anvil more than twice 2016-04-15 12:21:25 -05:00
cnr 91d5851628 Don't set a clan's lastOnline time to Timestamp(0)
Partially reverts f011fdad5f
2016-04-15 12:21:25 -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. 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
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
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
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 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 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 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
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
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 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 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
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
Joseph Prezioso Jr 09db5a8131 I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -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 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 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
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 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 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
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 02f774ce94 A lot of bug fixes 2016-04-04 16:45:20 +10: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 c92d291e96 Shift clicking TNT into the cannon + iron doors fixed 2016-04-03 21:32:56 +10: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 0abcd0044b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 10:53:28 +11: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
William Burns 4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01: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
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
Shaun Bennett 44abf8f1e2 Naming fixes 2016-03-31 16:47:16 +11:00
Ben 62280a8fa5 Fix diamond from flying far away when breaking diamond blocks in the fields 2016-03-31 01:11:30 +01:00
Ben 622843ca8e PC-47 - Remove item drops from tutorial cannon hit 2016-03-31 01:08:01 +01:00
Ben 0fd39e1300 missing event 2016-03-31 00:47:06 +01:00
Ben 36caf16c9a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 00:03:12 +01:00
Ben 0f22c4359d PC-19 - Remove World Event messages for players in Tutorial 2016-03-31 00:02:51 +01:00
phobia 978f978023 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-30 23:01:55 +11:00
phobia d6560fcf5c Fixes to Clan info goal 2016-03-30 23:01:39 +11:00
Shaun Bennett 5652eb75cf Fix NPE in MountCannonGoal 2016-03-30 22:33:23 +11:00
William Burns 5149043d14 PC-38 - Don't open gate until player is 12 blocks away 2016-03-30 01:09:29 +01:00
William Burns ed65f19417 PC-42 - Fireworks and Effects at end of tutorial 2016-03-29 23:41:31 +01:00
William Burns 1d4472255f PC-40 - Add cooldown to Tutorial /c home 2016-03-29 18:50:28 +01:00
William Burns 0bbfbff0b8 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-29 18:03:49 +01:00
William Burns 2fcd809447 PC-34 - Effects/Particles when you blow up enemy 2016-03-29 18:03:28 +01:00
phobia cd2d4c0f37 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-29 22:47:39 +11:00
phobia e75c7a3c91 PC-29 + fixes 2016-03-29 22:47:03 +11:00
phobia eab7cbe385 PC-35 2016-03-29 16:29:03 +11:00
William Burns f2d450d26b PC-30 - Claim land objective should use clan GUI 2016-03-29 00:07:50 +01:00
William Burns fc473275b0 PC-37 - Move Identify shops objective before go to shops 2016-03-29 00:02:07 +01:00
William Burns f8211f26cc PC-18 - Remove PVP Safety Message in Tutorial 2016-03-28 13:36:43 +01:00
William Burns 3d0d7f9d71 PC-43 - Remove join/quit messages while in tutorial 2016-03-28 12:38:57 +01:00
phobia fd3a04e794 Fixes for tutorial
PC-39    "about energy"
PC-32    Tutorial set home bed
PC-27    Change /c GUI for creating clan
PC-41    Disband via gui not command in tutorial
2016-03-28 22:13:28 +11:00
Shaun Bennett fa0594b5db PC-24 - Update Spawn Island Hologram 2016-03-28 13:55:37 +11:00
Shaun Bennett 9ff7e2da82 PC-21 - Combine Tutorial 1 and 2 2016-03-28 11:52:18 +11:00
Shaun Bennett f7c57a7699 PC-22 - Update Scoreboard Text 2016-03-28 11:47:16 +11:00
Shaun Bennett 8c1b91cbf5 PC-23 - Hotbar Flashing Text 2016-03-28 11:37:35 +11:00
Shaun Bennett 2d30983711 Adjust visuals 2016-03-28 11:29:15 +11:00
Ben 1aa4b4a47d remove player from tutorial on kick 2016-03-27 15:36:54 +01:00
Ben e4e40baf52 final stuff 2016-03-27 06:48:23 +01:00
Ben b4d340a655 cb fixed 2016-03-27 06:21:32 +01:00
Ben a175ead44a finished tutorial! 2016-03-27 05:43:31 +01:00
Ben a30a591b58 disable certain clans commands whilst in tutorial 2016-03-27 02:04:33 +01:00
Ben a8bd0e4406 add current Clan Outpost to travel shop 2016-03-26 23:20:03 +00:00
Ben 2070f0925d teleport to spawn after tutorial ends 2016-03-26 22:49:06 +00:00
Ben 0559ad9567 remove "you have not set a home" message and added a set home message 2016-03-26 22:45:20 +00:00
Ben 23cfa8ec25 mine diamonds fix (have to mine 11 instead of 10) 2016-03-26 22:36:27 +00:00