JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,135 Commits 1 Branch 0 Tags 481 MiB
f82a408f30
Commit Graph

559 Commits

Author SHA1 Message Date
libraryaddict
1f5cd624a4 Fix up iron golem, add slam attack 2015-08-28 11:42:33 -07:00
Ty Sayers
783f526b76 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:42:41 -07:00
Ty Sayers
4dcd54a9b0 Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans. 2015-08-27 14:42:07 -07:00
libraryaddict
379ee9271a Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta 
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
  Iron Wizard, fixed iron golem custom name
  Push golem block shot as per request
 2015-08-27 16:34:46 -05:00
libraryaddict
102fcd8e73 Push golem block shot as per request 2015-08-27 11:10:17 -07:00
Shaun Bennett
adfc451e9f You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift 2015-08-27 09:33:44 -07:00
Ty Sayers
9a45d1116a Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones. 2015-08-26 12:22:36 -07:00
Ty Sayers
69afefd66f Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java

Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
 2015-08-24 20:55:29 -04:00
Mysticate
7b42f2155d Tweaks. :D 2015-08-24 20:40:34 -04:00
libraryaddict
8798244351 Bosses stuff 2015-08-24 08:34:29 +12:00
Ty Sayers
a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
Ty Sayers
6c9a99fa1b Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning. 2015-08-22 15:06:05 -04:00
Mysticate
cbaaee60d9 Removed mob spectating method from evolving. 2015-08-21 13:00:08 -04:00
libraryaddict
39ede2064a Bosses game progress 2015-08-21 16:12:26 +12:00
Mini-Chiss
63107b0c26 missing file 2015-08-20 20:39:20 +02:00
Mini-Chiss
15c873392a updated give to allow naming of items. 2015-08-20 20:38:07 +02:00
xGamingDudex
633cbdabe2 player.isOnGround() is controlled by packets from the player, meaning 
players can easily fake being on the ground resulting in infinite double
jumps. player.getFallDisance() is also reset when isOnGround() returns
true, meaning we'll need to manually check if the player is on the
ground.

Outlines two opposite corners of the entities bounding box, scann all
blocks inside, check if any of them are solid and return respectively.
 2015-08-20 15:42:39 +02:00
fooify
859a7e07d5 added the optional functionality 
to include air blocks in the util
method getInBoundingBox()
 2015-08-18 16:46:20 -07:00
Mysticate
2659dd4e39 Fixed minor bugs. Head now follows mob altitude. 2015-08-14 23:17:56 -04:00
libraryaddict
81f793d693 Iron Wizard: Commit progress 2015-08-14 20:49:17 +12:00
libraryaddict
a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
libraryaddict
7fb85f24d1 UtilEnt: Change CreatureLook to support LivingEntity, not just Creature 2015-08-14 19:15:35 +12:00
libraryaddict
33a6e4cb13 UtilEnt: Add CreatureLook method 2015-08-14 19:12:05 +12:00
Mysticate
0c3c9702d9 Small fixes. 
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
 2015-08-12 09:44:55 -04:00
Mysticate
bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
 2015-08-10 19:47:53 -04:00
Mysticate
e81a3f7ecd Added a method to UtilAlg. 2015-08-10 14:32:49 -04:00
Shaun Bennett
b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Mini-Chiss
090c1f135d Merge branch 'SarahsAwesomeBugFixes' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
 2015-08-07 21:48:35 +02:00
Mini-Chiss
b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Sarah
abf12dbbfa Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes 2015-08-06 08:44:36 +02:00
Sarah
6a3d888f5b fix git 2015-08-06 08:44:16 +02:00
Mini-Chiss
ea0c6075f2 rank sifx 2015-08-05 20:25:23 +02:00
Mini-Chiss
e86e7b624e remnvoed special case for me 2015-08-05 10:28:05 +02:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Shaun Bennett
e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05:00
Mini-Chiss
8ea967b37e fixed possible NPE 2015-08-02 12:35:25 +02:00
Mini-Chiss
638406254b refactored a little so theres no data stored in the util 2015-08-02 12:07:00 +02:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Mini-Chiss
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Mini-Chiss
c9c3db70f3 Merge branch 'SSM2PlayerTeams' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-07-29 14:08:17 +02:00
Aaron Brock
da94c30c02 Stuff 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 18:06:00 -04:00
Aaron Brock
832fb4638a More things 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:42:00 -04:00
Shaun Bennett
16bad71dcc 1.8 Updates 2015-07-27 20:26:37 -05:00
Shaun Bennett
da3500cc32 Merge remote-tracking branch 'remotes/origin/master' into MC_1.8 
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
#	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
#	Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
#	Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
#	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
#	Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
#	Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
 2015-07-27 19:39:18 -05:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Mini-Chiss
dffde68982 fixed bug 
removed debug
 2015-07-25 17:11:02 +02:00
Mysticate
d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Mysticate
6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Shaun Bennett
d94f4f96a7 Observer mode changes 2015-07-18 16:40:50 -05:00
Shaun Bennett
1ef6fe3ed6 Observer changes 2015-07-17 15:37:33 -05:00
Cheese
6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
Cheese
44102842c9 added some velocity debug 2015-07-17 13:27:55 +10:00
Cheese
63f6adf295 fixed spawn picking 2015-07-17 12:50:34 +10:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Shaun Bennett
6a598690b0 Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix 2015-07-15 21:43:35 -05:00
Shaun Bennett
5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05:00
Shaun Bennett
dc1fe5fc2c Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager 2015-07-13 19:11:17 -05:00
Cheese
49daf597b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 12:47:57 +10:00
Shaun Bennett
a9e68ff777 Completed Energy 2015-07-08 21:39:31 -05:00
Sarah
5babd8a41a Fix number formatting for different system locale 2015-07-09 03:45:57 +02:00
Cheese
e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
Shaun Bennett
9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00
Shaun Bennett
0fce46f504 Finished Undead Camp Event (Loot tables still need adjusting) 2015-06-30 15:28:50 -05:00
Shaun Bennett
be974bfaac Work from laptop 2015-06-30 14:02:39 -05:00
Shaun Bennett
d07c319581 Saving some work 2015-06-27 22:22:02 -05:00
fooify
a36af0acc4 Remove space :) I assume this isn't intended 2015-06-24 10:28:39 -07:00
Shaun Bennett
935aba9c16 Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes 2015-06-23 21:45:55 -05:00
Aaron Brock
5280433dbd Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:03:53 -04:00
Cheese
478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
Cheese
2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Aaron Brock
750dddeabc Editing .classpath and a main testing method in UtilBlock 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-19 21:10:10 -04:00
Cheese
13ae7a19db jr.dev rank up 2015-06-19 18:06:40 +10:00
Shaun Bennett
dbdb2b3fc5 Scoreboards and WorldEvent work 2015-06-17 17:40:16 -05:00
Cheese
47744a80e9 jnr dev 2015-06-17 10:44:29 +10:00
Cheese
3014521e79 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-17 10:43:01 +10:00
Cheese
c8843aa2b2 jnr dev rank 2015-06-17 10:42:20 +10:00
Jonathan Williams
0d12a2c12d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-16 12:43:04 -05:00
libraryaddict
b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Jonathan Williams
88328148d1 Modified hardcoded IPs for Bungee player counts. 
Added Jr Dev rank.
 2015-06-15 12:52:59 -05:00
Shaun Bennett
8245b6c466 Schematic generation over time, fixes to gold manager drops 2015-06-14 17:30:02 -05:00
Shaun Bennett
b2bdfe384b Fix IllegalArgumentException with UtilPlayer method 2015-06-06 15:02:16 -05:00
Shaun Bennett
1f92564ea1 Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED] 2015-06-06 14:49:41 -05:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict
ef9c69f356 UtilShapes: Fix a method, add a space in OldMineWare in GameType 2015-06-06 18:08:37 +12:00
Cheese
f9b49caeed More gems for bridges/sg kills 
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
 2015-06-05 12:21:20 +10:00
Shaun Bennett
90a7362440 Marge with twiggys code, work on slime splitting 2015-06-04 00:21:09 -05:00
Shaun Bennett
d8acb0aae6 Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-06-02 20:45:53 -05:00
Shaun Bennett
5d431a586a King of the hill work 2015-06-02 20:44:14 -05:00
Shaun Bennett
68b708e32e Schematic Utilities for Clans 2015-05-29 18:23:46 -05:00
Shaun Bennett
dc994956e1 [Clans] Slime absorb work 2015-05-28 18:56:03 -05:00
Shaun Bennett
678c2c514a Oops! 2015-05-12 18:45:01 -05:00
Shaun Bennett
f9269b534f [Core] Add look AI to NPC's 2015-05-12 18:43:26 -05:00
Mini-Chiss
4cae02f2d8 set LT as higher than Owner for perms. 2015-05-11 21:31:37 -05:00
Mini-Chiss
e0e79d79a5 LT rank 2015-05-11 21:28:25 -05:00
Mini-Chiss
643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Mini-Chiss
5e73441b9a UHC world loading 2015-05-11 14:10:51 -05:00
Mini-Chiss
123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Shaun Bennett
a435ed5bae More build changes 2015-05-03 19:10:13 -05:00
Shaun Bennett
f98ac0874c Merge remote-tracking branch 'origin/master' 2015-05-03 18:22:14 -05:00
Shaun Bennett
fbfb5e637e Mob Gui + Ground Change Gui + UtilSkull for special mob skulls 2015-05-03 18:18:16 -05:00
Mini-Chiss
40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Mini-Chiss
40c838b030 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 14:50:56 -05:00
Mini-Chiss
8224450b44 Build Update 2015-05-03 14:50:50 -05:00
Shaun Bennett
17cbcc3771 Craftbukkit changes for UtilParticle update, and UtilParticle fix 2015-05-03 14:42:31 -05:00
Shaun Bennett
ff6da92fb7 Some Build world, support for far rendered particles 2015-05-03 14:41:09 -05:00
Mini-Chiss
6ad09f0ade Master Builder update 2015-05-02 22:05:12 -05:00
Mini-Chiss
ab6937a525 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 18:05:55 -05:00
Shaun Bennett
244ffece8a Fixes for build game + fix clans compile 2015-05-01 18:02:06 -05:00
Mini-Chiss
ba5802cc14 wizards kit availability 2015-05-01 00:47:51 -05:00
Shaun Bennett
ed0db983f8 More work on 1.8 update 2015-04-23 08:28:19 -04:00
Shaun Bennett
cf4353bedf Delete some classpath dummy changes, jsonmessage fixed 2015-04-22 16:37:45 -04:00
Shaun Bennett
f4b6d4e44e Starting on converting to 1.8 2015-04-22 16:06:38 -04:00
libraryaddict
aeff6bf4b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-22 00:25:56 +12:00
libraryaddict
8803941bd8 Wizards: More changes as per demand. 2015-04-16 05:51:08 +12:00
Cheese
482ee6eb79 changed builder rank name 2015-04-14 09:35:35 +10:00
libraryaddict
be21968805 UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion 2015-04-12 23:20:52 +12:00
libraryaddict
afa372dca7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
 2015-04-11 12:20:29 +12:00
libraryaddict
43163cd7d7 UtilParticle: Added lore for future reference on colored particles. 2015-04-11 12:14:12 +12:00
libraryaddict
28d0e28607 UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals 2015-04-11 12:13:37 +12:00
Cheese
85c9f9010e Added Twitch Rank 
fixes hitbox on glacial
 2015-04-10 13:11:02 +10:00
libraryaddict
d5137d9ec6 UtilParticle: Added option to send own particle strings, added two particles 2015-04-03 19:35:57 +13:00
libraryaddict
05319511ff UtilBlock: Modified getInRadius() to allow option of a hollow sphere 2015-04-03 19:34:24 +13:00
Cheese
f682bb8f9c fixed kit items not spawning 
horse pet doesnt spawn when dead
 2015-04-03 12:10:02 +11:00
libraryaddict
a27e6fba5c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-27 06:00:14 +13:00
Cheese
4a25265c7c Added utility methods to check for players within a sight pyramid 2015-03-25 17:13:22 +11:00
libraryaddict
510b6bcf80 Add optional checks to UtilInv.contains and UtilInv.getItems for cursor and armor items. 2015-03-23 13:13:16 +13:00
libraryaddict
c48dad8eeb UtilInv.contains() no longer loops through inventory contents, but uses getItems(player) which gets armor, inventory and cursor itemstack. 2015-03-23 13:06:19 +13:00
libraryaddict
1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
 2015-03-18 00:04:41 +13:00
Cheese
73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese
44e887ec61 fixed give command to properly assign item data 2015-03-17 12:06:41 +11:00
Cheese
420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
libraryaddict
bead4a7626 No longer need to constantly set the durability of items in the sheep game 2015-03-15 13:13:06 +13:00
libraryaddict
18094fea9b Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...) 2015-03-15 12:32:59 +13:00
libraryaddict
503106892d Fixed UtilTime for displaying decimals when trimmed 2015-03-15 12:32:42 +13:00
libraryaddict
e1c284722e Add method getEntityById to UtilEnt 2015-03-15 12:28:17 +13:00
Cheese
3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Cheese
8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
Jonathan Williams
17543910b5 Added Chest packages to support server. 
Fixed Punish not loading.
 2015-02-14 15:09:42 -08:00
Mini-Chiss
26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett
ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
Chiss
79cde8f5cf fixed util textbottom for 1.8.2 2015-02-05 21:39:42 +11:00
libraryaddict
505dcc1e8e Add friends gui, deprecate the old chatbased friends display 2015-01-30 13:46:07 +13:00
Chiss
f80e640d34 Map Parser voxel update 
Disabled spec GUI in bridges
other minor changes
 2015-01-26 11:23:08 +11:00
libraryaddict
92ef0af39d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
 2015-01-23 22:01:51 +13:00
Jonathan Williams
b92226a771 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 00:55:36 -08:00
libraryaddict
c5b444ae6e Wizards push 2015-01-23 21:52:03 +13:00
Jonathan Williams
73866669b8 Added RestartCommand and SuicideCommand 
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.

Fixed issue with new servers getting cleaned up as excess as soon as they started.
 2015-01-22 23:19:40 -08:00
Shaun Bennett
a1f2a3a2a1 Clan Energy 2015-01-22 20:34:44 -05:00
libraryaddict
fa47f33407 *cough* fixes to UtilTime *cough* 2015-01-23 02:31:00 +13:00
libraryaddict
94607585a3 Fixed UtilTime being bugged 2015-01-21 19:00:39 +13:00
libraryaddict
dd2418232c Wizards progress 2015-01-21 19:00:07 +13:00
libraryaddict
52d83587cd Fix dragon bossbar not being halved 2015-01-18 21:23:50 +13:00
libraryaddict
ea452d8fa5 Wizards progress 2015-01-18 21:23:48 +13:00
libraryaddict
a42cfed226 Add a comment on what each of the block hashsets do in UtilBlock to make it easier to use without struggling to remember 2015-01-18 21:23:46 +13:00
libraryaddict
0ad4034f96 The beginnings of a api to calculate shapes; mainly for particle use 2015-01-18 21:23:46 +13:00
libraryaddict
d6b5439eb5 Initilize the static byte HashSet's in UtilBlock not when you try to compare a block, but on class load 2015-01-18 21:23:45 +13:00
libraryaddict
b40393af10 Modify UtilPlayer to get the entity someone is looking at 2015-01-18 21:23:45 +13:00
libraryaddict
34ce818614 Stupid else ifs 2015-01-18 21:23:03 +13:00
libraryaddict
a64e082f2c Only add a 's' to UtilTime's convertString if the number in the string is not a 1 2015-01-18 21:23:03 +13:00
Jonathan Williams
97f57b655b Prevent horses from spawning in Clans 
Added Building supplies shop and pvp shop to clans.
 2014-12-29 06:44:00 -05:00
Chiss
f961fd0233 Merge remote-tracking branch 'remotes/origin/searchanddestroy' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2014-12-23 15:09:58 +11:00
Chiss
56d14b7bc0 Particle stuff 2014-12-18 12:45:45 +11:00
Chiss
a433ad764d Wither Morph 
Legend Particle
 2014-12-16 16:18:09 +11:00
libraryaddict
6d7a71d043 Modifications for SnD test 2014-12-16 15:14:07 +13:00
Chiss
4fd6ed80c4 final xmas Updates 
xmas hub
 2014-12-12 19:44:04 +11:00
libraryaddict
9a16616e6c Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas 2014-12-12 12:40:23 +13:00
Jonathan Williams
c4fee8e681 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/.classpath
 2014-12-10 03:34:53 -08:00
Jonathan Williams
ea034812b9 Fixed path finder crap in UtilEnt 
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
 2014-12-10 03:32:35 -08:00
Chiss
828fabb80a Initial Christmas Chaos update 2014-12-09 20:04:59 +11:00
Shaun Bennett
7402eb2f91 Merge remote-tracking branch 'origin/master' 2014-12-06 01:00:40 -06:00
Jonathan Williams
3d3f9012ff Added some base Clans shops. 
Added support for Gold

Refactored failed db call code a bit.
 2014-12-04 23:41:49 -08:00
Shaun Bennett
03bd2ed2c1 Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text 2014-12-04 17:48:06 -06:00
Jonathan Williams
59f93d46ec Refactored IButton 
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
 2014-12-04 05:05:27 -08:00
libraryaddict
0813f0a914 Instead of having a internal entityId. Use mojang's entityid's but add one everytime you want it. Also allow fetching of the next entityid to be used 2014-11-30 15:41:57 +13:00
Jonathan Williams
4b2998793c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-28 14:16:07 -08:00
Chiss
b3beadf8b5 made recharge look nicer for 1.7 
added missing files
 2014-11-29 09:14:33 +11:00
Jonathan Williams
515176b63f Clans to buildable state. 2014-11-27 22:34:20 -08:00
Chiss
19d3bba461 fixed fence glitch in dom 2014-11-22 13:20:34 +11:00
Jonathan Williams
ab78b4b89d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-19 22:25:17 -08:00
Jonathan Williams
1a6b80b08e More work on clans.. 
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
 2014-11-19 22:24:36 -08:00
Chiss
4961b55986 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16 Fixed dupe glitch (all games) 
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
 2014-11-18 16:43:39 +11:00
Shaun Bennett
f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Chiss
51bc53262d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b Merge remote-tracking branch 'origin/master' 2014-11-13 21:54:15 -06:00
Chiss
8ab0116a27 initial push of Wither Assault 2014-11-14 14:14:31 +11:00
Shaun Bennett
8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss
f6df7705b1 - Added 3 kits for DMT 
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
 2014-11-04 19:17:06 +11:00
Chiss
cfcfad610f Improved recruit/prepare countdown timers 2014-10-25 13:56:23 +11:00
Chiss
4002528c51 Updated GUI text. 
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
 2014-10-25 13:40:34 +11:00
Chiss
7dbba0a1f9 Added teleport for map parser 
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
 2014-10-25 11:17:32 +11:00
Chiss
92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +11:00
Chiss
b47dcf12af remvoed debug rank 2014-10-23 14:06:06 +11:00
Chiss
c2bb53c887 Halloween pumpkins 
Minestrike balance
bug fixes
 2014-10-23 14:05:35 +11:00
Shaun Bennett
ec81e9f511 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
 2014-10-16 17:51:32 -05:00
Chiss
5db2c072a0 Halloween update 2014-10-16 16:27:09 +11:00
Shaun Bennett
58f69b49d7 Add new chat features to JsonMessage 2014-10-15 11:11:32 -05:00
Chiss
eb5af41323 Added halloween reward pet 
minor bug fixes
 2014-10-15 15:44:26 +11:00
Chiss
e2c72a3ae2 HH update 2014-10-11 14:28:00 +11:00
Chiss
d0d2622ecc added UHC on-the-fly anti-xray 2014-10-10 18:54:38 +11:00
Chiss
8701f9ddcc Added TabTitle 
Converted MineStrike to use scoreboard name hiding
 2014-10-09 10:35:54 +11:00
Chiss
17e34e2060 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 10:49:42 +10:00
Chiss
31ceaad7fe MineStrike audio update 2014-10-03 10:49:26 +10:00
Jonathan Williams
d32085f05b Removed tab list stuff for friends. 
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
 2014-09-24 01:31:56 -07:00
Shaun Bennett
51ad6d8368 Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes 2014-09-18 17:33:05 -05:00
Chiss
fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Chiss
7e3b9b4b3a some 1.8 title stuff 2014-09-14 14:10:40 +10:00
Shaun Bennett
dea6c98fc9 Merge remote-tracking branch 'origin/master' 2014-09-12 14:08:22 -05:00
Shaun Bennett
4ea786a1a5 Fix fireworks for 1.8 client, a bunch more treasure stuff 2014-09-12 14:08:10 -05:00
Chiss
b5152bd621 removed some redundant repeated color stuff 2014-09-12 11:59:32 +10:00
Chiss
0dff0412d1 Fixed game flag for not allowing inventory opens 
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
 2014-09-12 11:47:39 +10:00
Chiss
2791d54040 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-11 13:43:34 +10:00
Chiss
56263718d7 Fix for BossBar 2014-09-11 13:17:57 +10:00
Shaun Bennett
b910c5098c Cross version Holograms (Alignment might be a tad off) 
A bunch of stuff for Treasure Chests
 2014-09-10 12:16:31 -05:00
Shaun Bennett
eb27c1dfbe Add Util class for sending titles to players 2014-09-05 19:46:11 -05:00
Jonathan Williams
2f8b53f771 Fix for customer support server. 
Fix for Boss bar junk.
Fix for Disguises.
 2014-09-05 14:36:10 -07:00
Jonathan Williams
d01529a344 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2014-09-05 04:38:23 -07:00
Jonathan Williams
1c6790b611 Fixed for DisguiseManager 
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
 2014-09-05 04:36:01 -07:00
Chiss
8c1e0c3e9e Fletcher data fix 
Minestrike stuff
 2014-09-05 15:45:14 +10:00
Jonathan Williams
b28fc8ee6b Added custom name tag fix for mobs for 1.8 players 
Worked on boss bar display.
Bug with <=50% hp.
 2014-09-04 11:33:51 -07:00
Shaun Bennett
e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams
92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
 2014-09-03 03:47:15 -07:00
Jonathan Williams
a4871b5509 Updated to latest spigot with 1.8 support. 
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
 2014-09-03 03:46:24 -07:00
Chiss
50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss
449281501f MineStrike Update 2014-09-02 16:49:15 +10:00
Chiss
207de0e67a fixed MAC kicking players on lillypads 2014-08-30 20:49:32 +10:00
Jonathan Williams
b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams
1bd0209b39 Added multi-server tags for npcs 
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
 2014-08-30 02:04:04 -07:00
Chiss
c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
Jonathan Williams
931cb5ece8 Removed MineKart code. 
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
 2014-08-23 00:40:07 -05:00
Chiss
a159f04d50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 04:30:52 +10:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams
83b3e49151 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 10:48:27 -05:00
Jonathan Williams
70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Chiss
0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss
97c087a28d Allowed commands to specify specific ranks 
allowed youtube/build to start/set games
 2014-08-22 17:05:14 +10:00
Jonathan Williams
99d15d3ece Work on Customer support server. 2014-08-21 15:55:09 -05:00
Jonathan Williams
830eeca835 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-20 20:14:32 -05:00
Jonathan Williams
315da32518 Removed unused code in Party 
Fixed path var in Core.Common
 2014-08-20 20:14:23 -05:00
Chiss
60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Shaun Bennett
a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Shaun Bennett
f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
Chiss
65c880b300 Parser changes 2014-08-20 12:06:24 +10:00
Chiss
94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Chiss
7535f39d18 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-20 10:39:58 +10:00
Chiss
afea0ba87f Parser Merge 2014-08-20 10:39:41 +10:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Jonathan Williams
d1e69a34f1 Fix chiss path errorrrrrrrrrrrrrrrrrrrrs. 2014-08-13 21:53:03 -05:00
Chiss
b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00