Commit Graph

7214 Commits

Author SHA1 Message Date
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
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
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 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 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
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
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