Commit Graph

225 Commits

Author SHA1 Message Date
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
Chiss 5ac48a02fb Stripped indicator func out of Condition
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
2014-04-15 17:53:24 +10:00
Jonathan Williams 81ab27cd83 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-14 17:09:47 -07:00
Jonathan Williams 6c8651d2c7 Fixed classes not being added. 2014-04-14 17:09:37 -07:00
Chiss 1c23cf7b4e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-14 09:27:44 +10:00
Chiss e5ea7483db Merge 2014-04-14 09:27:31 +10:00
Jonathan Williams d3a3cc278f Fixed ultra custom builds not saving.
Fixed default builds.
Fixed armor bug.
2014-04-13 04:24:22 -07:00