Commit Graph

431 Commits

Author SHA1 Message Date
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
Cheese c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
AlexTheCoder 0be51d5629 - Even more bugfixes 2015-10-29 16:48:51 -04: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
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 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
Cheese 86bad0be30 mods can check other players skills 2015-10-14 14:34:30 +11: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 e1d8b25e91 - Fix misc champs bugs 2015-10-13 01:24:57 -04:00
Cheese 3e5ac58ae9 helpers! 2015-10-13 11:23:00 +11:00
Cheese 37639a413c fixed skill stuff 2015-10-13 11:22:10 +11: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
Mysticate be96842de5 Ultra 2015-10-12 17:02:34 -04:00
Cheese 6a173073a4 added flag to projectiles
work on cow kit
2015-10-12 14:39:14 +11:00
Mysticate 83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
Mysticate 72d943f51b Restored skills to pre-eula ultra 2015-10-10 16:20:28 -04:00
Mysticate cdb9741438 Changed the SG icon in hub, fixed EULA breaking thing in Class Shop 2015-10-08 20:36:16 -04: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
Ty Sayers d870ff6f11 Fix bug where Fissure could be exploited with Arctic Armour for 'water bending', allowing players to artificially create Water towers by bending temporary ice. 2015-09-29 18:47:24 -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
Ty Sayers bc7615a5c3 Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players. 2015-09-29 17:36:42 -04:00
AlexTheCoder 7c04e5608d - Added new achievement 'Clutch'
- Made new achievements needed for achievement skills
2015-09-25 04:17:20 -04:00
Ty Sayers 3a8fd18d2e Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8. 2015-09-22 15:28:06 -05:00
Cheese d9142ac33f smash balance 2015-09-14 12:34:55 +10:00
Ty Sayers 9be0ecc598 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java

Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.
2015-09-11 17:01:04 -05:00
Ty Sayers b4248a3d5b Fix bug where Assassins could teleport outside of the Borders (causing their death) with several skills. Fix bug where crafting denials for certain items were not properly communicated to the user. Clean up use-cases for cancelling fishing to prevent players from not being able to use their class abilities. Fix bug where pigs could be struck my lightning using class abilities, spawning in pig zombies that could be farmed for gold. 2015-09-11 16:04:52 -05: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
Shaun Bennett 1b6833ae16 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-30 12:41:22 -07: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
Ty Sayers 54f910845e Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop. 2015-08-30 12:28:44 -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
Ty Sayers b98cde8b80 Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed. 2015-08-28 12:52:02 -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
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
Shaun Bennett bf1f62057c Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-08-24 22:15:08 -05:00
Shaun Bennett 6841cbac69 Clans bug fixes + shop updates 2015-08-24 22:03:26 -05: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
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
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
Sarah 16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
Mini-Chiss 2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +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 c9c3db70f3 Merge branch 'SSM2PlayerTeams'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
Jonathan Williams d3fede790a Merge pull request #17 in MIN/mineplex from MinorTweaks to master
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
  Fixed report link
  http://pastebin.com/BRhT7pZP
  Reverted things
  Reverted Trainee to Helper due to popular demand.
  LOTS of tweaks :D
  Cleaned up somethings (lib's request)
  I'm a dumbass
  Fixed a few achievements
  Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
Mysticate e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
libraryaddict eff71c3e17 Champions: Add Morten G's changes to fix BlockToss 2015-07-22 08:10:57 +12: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
Jonathan Williams 3b47b01aea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-07-19 20:18:08 -07:00
Cheese 558b71f866 fixed thigny 2015-07-17 11:48:14 +10:00
Shaun Bennett 096491f15d Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-07-16 15:51:29 -05:00
Shaun Bennett 2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Jonathan Williams 9cf4ff005a Added some debug checks. 2015-07-16 01:26:38 -05:00
Cheese ef4a575d28 fixed blocktoss exploits 2015-07-16 12:47:39 +10: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 9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00
Cheese 478a3c8591 some champs fixes/balance
duplicate message improvement
2015-06-20 15:00:16 +10:00
Mini-Chiss 40d56c3500 Converted all code to updated UtilParticle methods
/suicide
2015-05-03 16:37:00 -05:00
Mini-Chiss 45b801ba81 hitbox changes 2015-04-27 19:21:33 -05:00
Cheese c73a6ae62f champs balance 2015-04-19 13:49:46 +10:00
Cheese f4a91455f6 Champions Balance 2015-04-19 12:22:51 +10:00
Cheese f7ef44b007 More hitbox nerfs 2015-04-14 16:43:02 +10:00
Cheese 6cc18b61d1 reduced hitbox on flesh hook and lightning orb 2015-04-14 16:38:11 +10:00
Cheese 3d95a5cfa4 bloock toss fix 2015-04-10 14:09:21 +10:00
Cheese 85c9f9010e Added Twitch Rank
fixes hitbox on glacial
2015-04-10 13:11:02 +10:00
Cheese e0a58ba165 champions exploit fix update 2015-04-06 19:57:33 +10:00
Cheese cdb86d3ebb champions exploit fixes and balance 2015-04-06 17:17:36 +10:00
Cheese dc84621b6c blizzard snowballs expire 2015-04-04 16:01:48 +11:00
Cheese c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese d4e8c0c9a6 Added Respawn middle screen text
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
2015-04-03 15:28:10 +11:00
Cheese 9142227dd4 updates to SG border
balanced cleave for SG and Champs
2015-03-25 14:16:09 +11:00
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Shaun Bennett 90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
Shaun Bennett efce714375 DEVP-66 Refactor commonly used classes to Java conventions
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
Mini-Chiss 26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
libraryaddict 4f9f0afa29 BlockToss can no longer pickup blocks next to ladders 2015-02-01 09:40:36 +13:00
Jonathan Williams 2480361421 LightningOrb now strikes all living entities instead of just players. 2014-12-27 03:25:54 -05:00
Chiss 35bcf28c83 champions builds will now load in MPS, even if the current game isnt champs. 2014-12-23 23:44:59 +11:00
Chiss ec9401506c Game servers can now run champions/normal on the fly. 2014-12-23 11:18:48 +11:00
Shaun Bennett d19431a47f Rename Clicked to onClick 2014-12-17 18:40:44 -06:00
Shaun Bennett 6e42894d5c Refactor button again 2014-12-17 18:33:24 -06:00
Chiss fb8b00200c deep snow no longer slowz 2014-12-12 21:57:43 +11:00
Chiss 5d1a8af347 fixed arctic armor killing players in hub 2014-12-12 21:53:39 +11:00
Jonathan Williams 625d517058 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-08 00:55:43 -08:00
Jonathan Williams 342c44affc Fixed a bunch of clans bugs 2014-12-08 00:55:20 -08:00
Chiss ef8e5104f1 SnD Kits
minor bug fixes
2014-12-08 17:28:18 +11:00
Jonathan Williams 21e80af6cb Fixed Cosmetic menu buttons
Removed map in wrong location
Removed message for removing armor.
2014-12-05 01:15:25 -08:00
Jonathan Williams fbcc774383 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-04 05:05:43 -08: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
Chiss 38639fb58f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
2014-12-04 13:34:08 +11:00
Chiss 6cc4ec034b Champs Updates
UHC Y Limit in middle
2014-12-04 13:33:31 +11:00
Jonathan Williams abaf9f4693 Refactored IRelation method names
Added support for negative amounts in Support server.

Clans in core testing state.
2014-12-03 13:06:50 -08:00
Chiss 340f5d87a4 removed debug 2014-12-02 12:30:59 +11:00
Chiss 5695e845ef resistence no longer effects hold position. 2014-12-02 11:49:39 +11:00
Chiss 185b182061 fixed teleports removing you from the game 2014-12-02 09:50:30 +11:00
libraryaddict effc026913 Lets just pretend this was the original commit.. 2014-11-30 15:56:50 +13:00
libraryaddict ec26b8b642 Max item amount is 10 for non-bow classes. So sayth Chiss 2014-11-30 15:55:57 +13:00
libraryaddict 751731a1ad Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-30 12:14:51 +13:00
libraryaddict 6439fc93c2 Use metadata instead of storing the entity and location 2014-11-29 14:50:38 +13:00
Chiss 350a5cfcea disabled brute skill 2014-11-29 11:21:44 +11:00
Chiss b3beadf8b5 made recharge look nicer for 1.7
added missing files
2014-11-29 09:14:33 +11:00
Chiss 95e428eb4f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
2014-11-26 12:34:47 +11:00
Chiss 731b0d89dd Merge 2014-11-26 12:33:39 +11:00
Jonathan Williams d9c06e0fd3 Shauny! 2014-11-25 13:26:30 -08:00
Jonathan Williams 484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams 3b54789767 Optimized logins dealing with mysql with multiqueries.
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
2014-11-25 13:25:13 -08:00
Chiss 50b2870705 changed locked ability icon to diamond 2014-11-23 14:13:00 +11:00
Chiss 0e4b21e6b1 disabled charge skills being usable in hub 2014-11-23 11:46:47 +11:00
Chiss 01f0e5fab4 fixed static laser not doing less dmg when not charged 2014-11-23 10:35:56 +11:00
Chiss 6dfcdce027 increased illusion cooldown
cleaned axethrow
2014-11-22 10:29:00 +11:00
Jonathan Williams 3dfd7e6036 Fixed Champions bug with losing builds. 2014-11-21 14:39:51 -08:00
Jonathan Williams 64a1426463 Added custom build load check on login. 2014-11-20 23:52:56 -08:00
Jonathan Williams 29204de987 Removed old benefits.
Added youtube rank application from Owner

Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken
2014-11-20 21:58:39 -08:00
Jonathan Williams 2446e6d64d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-20 21:42:40 -08:00
Jonathan Williams 1f5be77880 Fixed text in Dom shop.
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
Chiss f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Chiss 7a8759dfba updated disguisemanager so it uses player arg
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Jonathan Williams 77b47c9e13 Fixed UI achievement skill stuff. 2014-11-20 08:50:25 -08:00
Chiss 972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Chiss 450cc9ada2 Champions achievement update
Wither update
2014-11-20 17:21:22 +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
Chiss ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Chiss d7141e4943 Added warning note to punish 2014-11-11 20:02:35 +11:00
Chiss cd4d2c16a8 Fixed fortitude healing too much 2014-11-07 14:07:22 +11:00
Chiss f3b9ad8adf Chatting will reset Idle Timer in games (for DMT)
Minor kit changes
2014-11-05 14:46:49 +11:00
Chiss b00fb0952a Updated Sheep Quest to be 1.8 comptible.
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11: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 20fe69b596 added skills to lore of custom builds
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11:00
Chiss da88d68513 UHC does not record team stats 2014-11-01 15:42:52 +11:00
Chiss 83d182db2e Fixed Villager exploit! oops
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss aa45f031ac 3 new achievement Kits
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +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 347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10: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
Shaun Bennett 8d06cddfb2 Remove Chiss' debug message for shop 2014-09-02 20:36:25 -05: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
CoderTim fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams 1398543490 Fixed bug with Projectile
Changed tp out of game to 1 per tick.
2014-08-21 02:07:54 -05:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
CoderTim 09c01d90ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 19:07:37 -04:00
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
CoderTim 05686cb584 Work on achievements 2014-08-18 16:41:16 -04:00
Chiss 85522cddca Debug (will clean once fixed)
Game stats
2014-08-15 09:49:00 +10:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Mini-Chiss 62f6ea815d Champs Balance Update
Map Parser Update
2014-07-07 16:23:55 -07:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams 57c3845df9 Finished up preferences.
Each preference saves, loads on login.
GUI working great.
2014-05-30 01:42:43 -07: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
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 3859a42f1d Removed broken and obsolete shifter code
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams eae2d41fad Fixed party out of bounds exception.
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
Jonathan Williams ebf40afe75 Fix dom bow shoot in lobby bug.
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Chiss f79b3b147c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-06 15:59:20 +10:00
Chiss 223da7bf4d ResetAll for class skills 2014-05-06 15:55:14 +10:00
Jonathan Williams a9f4a900f0 Working on fixing dead chunks.
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
Chiss 1d4d98b910 Twitch Prep
MAC changes
2014-05-02 14:35:41 +10:00
Chiss 8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2014-05-01 09:33:59 +10:00
Chiss 423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams fd372b8418 Changed skills to 2k gems each.
Changed power/booster to 2k gems each.

Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
2014-04-28 01:05:08 -07: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
Chiss 07ca3a83ca Arrows shouldnt bounce 2014-04-26 13:37:01 +10:00
Chiss b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10:00
Jonathan Williams a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07: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 9495630bf2 CP rate increase 2014-04-25 11:10:37 +10:00
Jonathan Williams 7fef4adbee Fixed resupply resetting skills. 2014-04-22 22:19:03 -07:00
Chiss 0325892e2a Champs water fixes
First push for Twitch games
2014-04-23 10:21:01 +10:00
Jonathan Williams e62dfb0dd2 Fix skill/item packs not deducting gems.
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
Jonathan Williams 7680eaaedc Fixed non-Ultra being able to unlock spells/skills.
Fixed Items that weren't free.
2014-04-22 11:20:00 -07:00
Jonathan Williams 2378df6191 Fixed builds losing tokens. 2014-04-22 10:35:56 -07:00
Chiss 923d2455d0 Stampede ends immediately on taking damage 2014-04-21 17:21:52 +10:00
Chiss 62c245d728 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-21 17:06:08 +10:00
Chiss 0f0b66a8cf Stampede cancel on damage taken 2014-04-21 17:04:51 +10:00
Jonathan Williams 9ce6d4866d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-20 23:37:01 -07:00
Jonathan Williams e012129427 Fixed edit custom build bugs.
Fixed vehicle exit event not firing.
Fixed item info not showing once you have the item.
2014-04-20 23:36:45 -07:00
Chiss b1e082b73a fixed riposte bug
tweaked capture effects
2014-04-21 11:56:14 +10:00
Chiss 0eaa3110f5 Risposte nerf 2014-04-21 11:18:14 +10:00
Chiss 07098b0b82 fixed no damage on weapons
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
2014-04-21 10:48:04 +10:00
Jonathan Williams 60039d5b76 More missing files. 2014-04-20 01:07:59 -07:00
Jonathan Williams 8bf40169f3 Added missing files. 2014-04-20 01:06:55 -07:00
Jonathan Williams 65e94e59cc Changed item tokens to 10 for non bow classes.
Fixed token prices on power/booster items.
Removed You already have this item message on items in CustomBuild.
2014-04-20 01:06:17 -07:00
Jonathan Williams 1f225f05ff Custom build fixes. 2014-04-20 00:27:32 -07:00
Jonathan Williams dc625726c4 Item Custom Build Fixes. 2014-04-19 22:54:52 -07:00
Jonathan Williams 458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00
Chiss 845d45bd4d fixed some skill bugs
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
2014-04-20 13:50:15 +10:00
Chiss 1bf1f04d53 Champs Stuff 2014-04-19 14:50:14 +10:00
Chiss 424f915388 Champs Merge 2014-04-18 13:24:30 +10:00
Jonathan Williams 6b07541b3b DERP JONLONS 2014-04-15 18:40:43 -07:00