Commit Graph

1155 Commits

Author SHA1 Message Date
NewGarbo d8ae035f84 creative scoreboard team. and fixed npe in tutorials 2015-11-28 09:20:42 +00:00
libraryaddict d4ab57e4e7 Update for 1.9 dual version 2015-11-28 19:38:58 +13:00
Cheese 963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Cheese 8af545af80 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
Cheese 0871663498 titan stuff
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
Shaun Bennett 1a87d85174 Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-27 23:13:43 -05:00
xGamingDudex 24f8a98545 Added titan particle trail. 2015-11-28 02:22:41 +01:00
Sarah e81aa72c7e Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-27 20:33:18 +01:00
libraryaddict 5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
NewGarbo 3be2986cea sethome command now places bed even if theres grass 2015-11-27 13:26:12 +00:00
Cheese 4e2f48b37e Merge branch 'master' into clans-beta
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
Cheese 98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo 0aaee24600 fixed gear UI display stuff incorrectly 2015-11-26 21:06:33 +00:00
NewGarbo 56d5c10481 oops util ent new method didn't commit in last commit 2015-11-26 07:29:59 +00:00
Cheese 193c5fe487 fixed static 2015-11-26 15:26:57 +11:00
Cheese 059a9a32cd fixed method 2015-11-26 14:51:45 +11:00
Cheese 1a5dbc073d recursive block find method 2015-11-26 14:47:01 +11:00
NewGarbo 11deec75dd fixed illusion 2015-11-26 00:44:13 +00:00
Shaun Bennett 1306137cb2 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-25 14:51:00 -05:00
Shaun Bennett ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
NewGarbo 9a8fba543d auto-replanting trees 2015-11-25 17:03:48 +00:00
NewGarbo 2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
xGamingDudex 84fde1c087 Fixed double jump and entity ground tool.
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.

Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
xGamingDudex 3b89d65a09 Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
NewGarbo 459e1beeff clans buggy fixers 2015-11-24 22:18:48 +00:00
Keir dcca67e571 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-22 13:54:16 +00:00
Cheese 4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
AlexTheCoder f51358552a -B 2015-11-20 05:57:29 -05:00
Sarah ad280c96c9 adding interactive Chat elements. 2015-11-19 20:45:40 +01:00
NewGarbo 0a667afeb1 finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching 2015-11-18 22:27:01 +00:00
NewGarbo eded09b1a9 fixed yet another bug with beds... argh it seems to be working fine now. 2015-11-18 21:02:39 +00:00
Keir cb5672b94c Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-18 20:34:24 +00:00
NewGarbo 6f3693f804 more bug fixes 2015-11-18 19:32:20 +00:00
NewGarbo 924504ac9f fixed clans home NPE. also added GRASS to UtilItem's item property system. 2015-11-18 19:03:44 +00:00
NewGarbo 9eaffc8acf Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on. 2015-11-18 12:17:00 +00:00
Shaun Bennett 4183f0ce07 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
2015-11-17 18:05:17 -05:00
Shaun Bennett f6cfc36e9f War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard 2015-11-17 17:59:35 -05:00
NewGarbo 31906b025f Clans Home switched over to using physical beds.
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
2015-11-17 22:24:19 +00:00
Shaun Bennett 07f92d2e6e Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
2015-11-16 14:39:47 -05:00
NewGarbo fff248ad86 king of the hill gold drop fix 2015-11-15 20:37:37 +00:00
NewGarbo 5209cf3d38 fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself. 2015-11-15 20:04:44 +00:00
NewGarbo 22ae67ba81 king of the hill changes. (renamed enum for it for ease of typing) 2015-11-15 19:57:00 +00:00
NewGarbo c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
NewGarbo e28059848c New 1.7 leaves fix for UtilBlock#getHighest() 2015-11-15 08:51:59 +00:00
Shaun Bennett 487f974951 Clan Gui updates and code cleanup 2015-11-13 23:53:34 -05:00
Shaun Bennett 639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
This reverts commit 6c17b2926c.
2015-11-12 17:51:13 -05:00
Shaun Bennett 6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
2015-11-12 16:35:31 -05:00
AlexTheCoder bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
Keir 2722aeaaec Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-11 14:53:49 +00:00
Jonathan Williams 27ef2c0bbb Fixed UtilEnt.Leash method. 2015-11-11 04:36:10 -06:00
Keir e00c11ae28 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-10 11:17:49 +00:00
Shaun Bennett 610b5dbeb2 More work on gui 2015-11-09 14:39:52 -05:00
AlexTheCoder dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
Shaun Bennett addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
libraryaddict 627ce08113 Add info on note particle 2015-11-07 21:35:26 +13:00
AlexTheCoder fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
2015-11-06 18:43:11 -05:00
NewGarbo b835823230 Preferences page changes to free up space, as the current preferences layout is completely full.
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
2015-11-06 13:19:02 +00:00
Keir 0c0b3708c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-06 01:34:13 +00:00
AlexTheCoder 9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo 1375623625 Added alpha messages. 2015-11-04 17:03:52 +00:00
NewGarbo 7f03ca0936 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
NewGarbo 78ab895a14 Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds.
Made it so that players using the broadsword's effects cannot attack anything.

Added small smoke particle to UtilParticle.

Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.

Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.

Removed some debug messages thrown around the code.
2015-11-03 19:49:14 +00:00
libraryaddict c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict f66c85d5b0 When clearing or getting items from player inventory, get it from player crafting as well 2015-11-03 18:57:41 +13:00
libraryaddict 3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
Shaun Bennett 4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
libraryaddict 3f66e11b3d Add fence to non-full-solids 2015-11-03 12:39:13 +13:00
NewGarbo 74c0eac141 Bunch of fixes and new stuff:
Cleaned up code everywhere.
Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops)
Removed the tutorialManager access from ClansManager, as it is unneeded now.

Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.)

Fixed NPE in TutorialTask#onFinish(Player);
2015-11-02 08:04:38 +00:00
NewGarbo baa4a744fb Fixed a whole load of bugs:
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
2015-10-31 23:11:12 +00:00
Cheese b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
NewGarbo 396ce75087 Bug fixes/Additions:
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00:00
libraryaddict ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
libraryaddict 388aa1611c Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate 2015-10-30 15:44:37 +13:00
Cheese c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
NewGarbo 0c5e34ad84 Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones! 2015-10-29 12:56:00 +00:00
libraryaddict 14df456b3d Progres 2015-10-29 21:39:38 +13:00
NewGarbo d0bfb2e2e9 Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event. 2015-10-29 08:35:24 +00:00
NewGarbo a063da4cae Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts. 2015-10-28 22:55:10 +00:00
NewGarbo afadd61431 Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int. 2015-10-28 22:47:30 +00:00
NewGarbo cffcf245e9 UtilItem.java overhaul, complete item attribute system added. 2015-10-28 22:14:08 +00:00
Keir 38425f25fe Add missing child overridden methods for chaining. 2015-10-28 16:03:02 +00:00
libraryaddict 5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
NewGarbo eb350a79c3 Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing. 2015-10-26 12:21:33 +00:00
NewGarbo 1e4b3442fa Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
NewGarbo 63bc492f2c Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code. 2015-10-24 20:36:53 +01:00
NewGarbo 18d998fc04 Fixed colors cutting out in the middle of the message in task information, moar fireworks! 2015-10-23 05:56:53 +01:00
libraryaddict ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
NewGarbo a2278297de Created the base for tutorials, and created the getting started tutorial.
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
2015-10-19 17:16:48 +01:00
libraryaddict 55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett 177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -04:00
AlexTheCoder 12319169a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
libraryaddict 14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
libraryaddict f71cb80bd0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
libraryaddict 70c76d976f More changes 2015-10-16 22:10:13 +13:00
libraryaddict 3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict 4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
Shaun Bennett 88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
libraryaddict 58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
AlexTheCoder f497eab633 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
Mysticate 20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
Cheese 7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
Mysticate 7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Mysticate 90c685617d Animation 2015-10-09 22:14:01 -04:00
xGamingDudex ba171f95c6 Fixed UtilEnt.isGrounded for non-player entities.
Updated UtilEnt.isGrounded(Entity) to only apply custom handling of
players. Non-player entities now uses the default .isOnGround() check.
Implemented to fix entities like minecart which applies custom
is-on-ground checks.
2015-10-09 14:42:38 +02:00
Cheese 99fd88473b rank colors 2015-10-09 14:20:02 +11:00
Mysticate 082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese ec5694737c statsmanager debug
rank fix
2015-10-09 11:44:12 +11:00
Cheese 3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
alexmack929 6c73b1a5ac Start moving i18n into master. 2015-10-04 15:24:58 +01:00
Ty Sayers 661bba3714 Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description. 2015-10-02 13:57:46 -04:00
Shaun Bennett 5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Mysticate 68c6ba595e Visual enhancements. 2015-09-30 19:31:36 -04:00
Ty Sayers b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
Shaun Bennett 8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Mysticate 00eecc0325 Fixes 2015-09-28 20:33:38 -04:00
Mysticate eea7ef8350 Swag 2015-09-27 02:11:28 -04:00
Mysticate b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Christopher Jozsa 9a3ef895c9 Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
  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.
2015-09-23 19:37:48 -05:00
AlexTheCoder c709980db3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
fooify 0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07:00
Cheese d9142ac33f smash balance 2015-09-14 12:34:55 +10:00
fooify 2de7fff267 Merge remote-tracking branch 'origin/master' into monster-maze 2015-09-13 08:45:34 -07:00
Cheese c9971bb117 fixed duplicate rank name 2015-09-12 16:45:22 +10:00
Cheese 4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Cheese a4cc70c3f0 new small youtuber rank 2015-09-10 13:17:11 +10:00
Ty Sayers 15b51fe575 Fix bug where Fissure skill travelled through doorways as well as increase cooldown. Fix bug where Cobwebs could be thrown inside spawn safe zones and increase cooldown. Modify StaticLazer skill's range, damage, cooldown, and damage radius for balance purposes. Remove the ability to craft TNT Minecarts and Jukeboxes. Disable fishing ability in Clans. Add the requirement that players must crouch while clicking on furnaces to be able to smelt. Fix bug where Axes weren't considered a weapon in the context of player murders. 2015-09-07 20:39:34 -05:00
Cheese 03537e4650 fixed a spacing issue 2015-09-04 12:18:02 +10:00
Cheese 0ec3a8dc10 added radar for ctf and dom 2015-09-04 12:09:26 +10:00
Shaun Bennett 5d77202370 Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss 2015-08-30 12:41:15 -07:00
Mini-Chiss 05ecfb8ff0 snake workin! 2015-08-29 16:33:35 -07:00
Ty Sayers 227a077dba Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
2015-08-29 15:53:42 -07:00
Shaun Bennett 4aee4f8fd7 Fix generators 2015-08-29 15:09:02 -07:00
Ty Sayers aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Mini-Chiss eb6a0c9e38 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-29 14:27:54 -07:00
Mini-Chiss efd435396f snake 2015-08-29 14:27:40 -07:00
Shaun Bennett 16d807db2e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-29 14:01:45 -07:00
Shaun Bennett fae27df496 Add ClansLoginManager, TNT Generators (Still needs persistence) 2015-08-29 13:35:31 -07:00
libraryaddict e7f861a6c2 Push golem changes, snakes code and rename bossability thingy 2015-08-29 12:04:53 -07:00
Mysticate ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Ty Sayers 825dd66283 Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones. 2015-08-28 14:17:11 -07:00
Jonathan Williams e9b33668bc Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
libraryaddict 249ecdd381 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-28 11:42:53 -07:00
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
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Chiss 7aa017772f Spectators will not play particle effects
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
Chiss 951e1df3d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:05:34 +10:00
Jonathan Williams 0de8d22e62 Changed invis in hub to only be on server npc shops
Fixed /a for senior mods and developers.
2014-08-09 00:06:44 -05:00
Chiss 62eccbcc1e Snr Mod
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
Chiss 313f675ae4 Hub Parkour update
Smash kit prices
2014-08-09 12:16:37 +10:00
Jonathan Williams c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams 6d86f403ac Added coins Currency to web api
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
Chiss dc1a37a92e Gadget STuff 2014-08-07 17:30:46 +10:00
Jonathan Williams d129f722a3 Cleaned up Firework util. 2014-07-29 21:09:16 -07:00
Chiss 4f46ccc8aa Winner is decided on bridge tourney timeout 2014-07-26 20:29:01 +10:00
Chiss fa73ab5335 Bridges Tourney stuff 2014-07-26 17:40:17 +10:00
CoderTim b15534e1b2 Some work on Sneak Assassins NPCs
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04:00
Jonathan Williams 2e5b003cff More work on internet status stuff.
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
Jonathan Williams 39b2ad57be Fix for map parser zipping. 2014-07-08 12:37:39 -07:00
Mini-Chiss cf25bdc44f Bridges fix being able to break mid chests before gamestart
Map parser Updates
2014-07-07 19:04:44 -07:00
Mini-Chiss c65712c260 UHC fixes
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
Mini-Chiss 31772196a9 More scoreboard stuff (TDM)
New Tug game
2014-07-01 18:30:04 -07:00
Mini-Chiss 8c461b3e1b Cooldown on Spec Compass
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
Jonathan Williams 57c52cb9c8 Improved MapParser to allow world loading/saving for immediate testing. 2014-06-25 20:53:28 -07:00
Jonathan Williams f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams 4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Jonathan Williams 93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00
Jonathan Williams 3ae119d88a Fixed hub package unlock bug.
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
2014-06-08 11:27:14 -05:00
Chiss 937f5d8ef2 Hub stuff 2014-05-30 17:17:53 +10:00
Jonathan Williams 449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	.gitignore
2014-05-27 02:23:22 -07:00
Jonathan Williams 0634ee5543 Removed unused global stuff in Mineplexer.
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
2014-05-27 02:10:29 -07:00
CoderTim 49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams 6af5d9205b Added TimeUtil.java
Removed double gems.

Removed extra world uninitialize.

Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
Jonathan Williams 0ec08d5208 Fixed chunk load outside borders (disabled for testing right now) 2014-05-09 21:18:38 -07:00
Jonathan Williams f079333d3b Optimized ChunkBlockChange.
Still no dead chunks!

Fixed LobbyManager advertising to an empty lobby.
2014-05-04 18:29:19 -07:00
Jonathan Williams f623026dfc Fixed projectile order issue..check for dead before collision.
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
Jonathan Williams a9f4a900f0 Working on fixing dead chunks.
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
Jonathan Williams 484ba97b23 Updated file delete mechanism so there is no reflection.
Removed list block on deleting players from coreclient quit.
2014-05-02 23:12:39 -07:00
Chiss 77809b409d MAC Update 2014-04-28 12:28:48 +10:00
Chiss 40ef432211 Cannot use skills/items in HubManager
Dom CP score rate lowered
Dom items dont use energy
2014-04-28 09:41:00 +10:00
Jonathan Williams 9136fa0b15 Upgraded to latest spigot.
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
2014-04-25 00:44:14 -07:00
Chiss ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Chiss 80df2c2944 Bux fixes for 1.7
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Chiss 71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss 2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams 0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams bedabd84cc Added silence to kits (UtilEnt.silence)
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
Jonathan Williams e8260b20f7 Fixed dragon spawn location for text util. 2014-04-07 23:35:45 -04:00
Chiss 8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Chiss 13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss f5ca6408f8 Merge? 2014-03-28 14:51:26 +11:00
Jonathan Williams f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams 515a01fd7d Updated utils. 2014-03-19 02:40:36 -07:00
Jonathan Williams 7f58453688 Updated Particle. 2014-03-19 02:25:28 -07:00
Jonathan Williams 7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Chisstop 2b56b970fa Sheep Game? 2014-03-04 22:39:48 -08:00
Chiss 7cf6391ddd Sheep Quest
Double Gem Weekend
2014-03-01 10:35:06 +11:00
Jonathan Williams 6f43d91bcf Added Vegetate for Bat.
Added missing ProcessRunner.java
2014-01-20 21:01:52 -06:00
Chiss 1031846198 SSM Update
Gravity game start
2014-01-18 12:34:24 +11:00
Jonathan Williams 8e51e4061a Reverted Hub.
Fixed server monitor issues.
2014-01-14 02:04:06 -06:00
Chiss d25487d545 Rank color 2013-12-24 19:21:21 +11:00
Jonathan Williams 793b17e878 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 03:23:07 -05:00
Jonathan Williams 7574a5972b Prevented sounds from silenced vegetables. 2013-12-21 03:22:58 -05:00
Chiss c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Jonathan Williams 70c14268e1 Fixed Leash issue.
Added invis for utilent.ghost
2013-12-21 02:44:12 -05:00
Jonathan Williams f504cb5a8d Added vegetation to horse.
Added Leash method to UtilEnt
2013-12-20 03:52:43 -05:00
Jonathan Williams 0ba8349e03 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-18 04:48:24 -05:00
Jonathan Williams 64dab19003 Cleanup
Prep work on leash disable functionality.
2013-12-18 04:48:16 -05:00
Chiss 54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Chiss 4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss 1eebed737e Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2013-12-13 18:05:08 +11:00
Chiss 5f2e457362 Minor HG Stuffs ;o 2013-12-13 16:21:39 +11:00
Jonathan Williams d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
Chiss 8807854b57 Added Draw 2013-11-29 23:38:38 +11:00
Chiss 48e392fdf0 HG;
-compass
-deathmatch
-various fixes
2013-11-25 20:59:46 +11:00
Jonathan Williams e2646a982f Added MultiBlock packet.
Tweaked performance for chunks that are < 64 changes for HungerGames.
2013-11-24 04:54:41 -08:00
Chiss a5a80378f7 Loot fixes 2013-11-23 09:15:13 +11:00
Jonathan Williams 9c9e5f1ae0 Added goal selector clear for entities in UtilEntity 2013-11-22 00:38:24 -08:00
Chiss 0a683416ff SG Update 2013-11-22 18:40:38 +11:00
Chiss 03731de7f8 Rank changes
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Chiss 386e2e3067 Added Champs
MAC update
2013-10-31 09:45:11 +11:00
Chiss 4974fc17aa Halloween balance (slightly easier)
Giant hitbox improved
2013-10-27 15:24:28 +11:00
Chiss a52bd69558 Witch SSM 2013-10-26 11:34:05 +11:00
Chiss 5563d94111 Halloween event update
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
Chiss 1977572ced Added Halloween Minigame
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
Chiss 2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams 25dec6fb46 Fixed player arm animation bug.
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
Jonathan Williams 42b932e612 Added inventory move prevention for all inventories
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
2013-10-12 01:55:32 -07:00
Chiss 3ba848567c paintball added
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
Chiss 064dd97d00 HitBox support for disguises
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
Chiss 9064272a38 Prepared SSM for 200 player Game (added hunger) 2013-09-21 13:34:14 +10:00
Chiss 9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss a92c74a28a HG Updates
Other minor fixes
2013-09-21 08:34:07 +10:00
Jonathan Williams 85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams 817fa5737c Added nether teleportation to game world. 2013-09-14 02:02:34 -07:00
Jonathan Williams c976a46f1f Optimized UtilText/MapUtil.java
Added quick game menu.  Still needs work.
2013-09-13 15:25:01 -07:00
Chiss b1744e86d8 many UHC bug fixes
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
Chiss ea81e558ea Added;
- Death Tag
- Dragon Escape
- Barbarians

Spleef; added hunger
Dragons; added knockback
Turf Forts; buffed shredder + fixed infil on respawn

Added knockack to 1 damage attacks.
Removed 'hit sound' from hitting mobs (just plays animal sound)
2013-09-11 12:22:55 +10:00
Chiss 7ab04be00c Added Hub Parties
Re-did Hub Tutorials
Added Party Tutorial
2013-09-07 14:09:12 +10:00
Jonathan Williams 97405f6cfa Fixed NPE in SkillPage
Added some timing debug text // for now
Changed utiltext setting method.
2013-09-04 18:52:08 -07:00
Chiss 010336983a SSM: fixed fissure not working
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
2013-09-04 18:03:01 +10:00
Jonathan Williams 63b4776893 Garrrr, fixed craftbukkit building. 2013-09-03 20:43:32 -07:00
Chiss 668a6e4854 changed utilplayer health method to double
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
2013-09-02 09:35:04 +10:00
Jonathan Williams d14b21d29f Removed VoteHub.java
Added commons codec to all build paths for Ant
Fixed pet shop new name.
Added send all for Portal.
Updated Hubmanager
2013-08-31 20:28:35 -07:00
Jonathan Williams c0198b1b1f Fixed vegetate...derp. 2013-08-31 01:36:40 -07:00
Jonathan Williams 50ea1867e9 Added slime vegetate.
Fixed dominate changes.
2013-08-31 01:16:39 -07:00
Jonathan Williams 13110356aa Added Enjin Translator poll ability.
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
2013-08-30 16:37:21 -07:00
Jonathan Williams 1b7b549647 Removed class files from source control. 2013-08-27 16:21:57 -07:00
Jonathan Williams 3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00