Commit Graph

1158 Commits

Author SHA1 Message Date
Chiss 3f24325c3c removed +50% player limit for CC 2014-12-12 21:23:01 +11: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
Chiss adafc95d3f boss weaker 2014-12-12 10:26:32 +11:00
Chiss 2be4d7d6d2 XMAS UPDATE 2014-12-12 10:03:25 +11:00
Chiss 3af8a90d3b near final xmas push :D 2014-12-11 15:23:01 +11:00
libraryaddict 3a8ab0afb0 Uncomment SleighHorse 2014-12-11 15:24:10 +13:00
Chiss 6b1fa91565 Xmas Updates 2014-12-11 12:42:06 +11:00
Chiss 86b9d8342f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
libraryaddict ee8d699bd1 Minor text cleanup in the sleighhorse code because you guys seem to like that 2014-12-11 07:25:40 +13:00
libraryaddict 2a13255af3 Turn christmas chaos game horses into reindeer 2014-12-11 07:23:47 +13:00
Chiss 068a0901f9 xmas updatre 2014-12-11 00:16:15 +11:00
Chiss 358d5fde44 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-10 22:38:19 +11:00
Chiss 450d3eb923 merge 2014-12-10 22:38:08 +11: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 db8e0484ab missing files + new pet 2014-12-10 18:23:22 +11:00
Chiss 0aba82eee6 fixed some eclipse java6 stuff with mail
Christmas game update
2014-12-10 15:38:57 +11:00
Chiss bee81ff455 lowered coin rewards 2014-12-09 20:23:56 +11:00
Chiss 828fabb80a Initial Christmas Chaos update 2014-12-09 20:04:59 +11:00
Chiss 50358c0c30 removed EULA breach in bridges private blocks 2014-12-08 18:23:47 +11:00
Chiss ef8e5104f1 SnD Kits
minor bug fixes
2014-12-08 17:28:18 +11:00
Chiss 64c8edc292 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-08 17:25:03 +11:00
libraryaddict 048aa40590 Remove comments and add comments 2014-12-06 03:25:53 +13:00
libraryaddict 307d280534 Read merge message 2014-12-06 02:22:52 +13:00
Chiss 4430efd7be minor updates 2014-12-05 16:25:34 +11: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 a8deee5292 fixed a spelling error 2014-12-02 18:04:48 +11:00
Chiss 6319bffd42 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-02 09:50:47 +11:00
Chiss 185b182061 fixed teleports removing you from the game 2014-12-02 09:50:30 +11:00
Jonathan Williams e7cf4eb51d Removed use of Gem Boosters
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
Jonathan Williams 9d39cb922c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 01:22:51 -08:00
Jonathan Williams 433483dcca Fixed error in GameLootManager 2014-12-01 01:22:43 -08:00
Chiss cee48f1978 made it so you can use fireworks without aiming against block in blockhunt
removed fire from magma blast
private blocks are no longer private if owner is dead
2014-12-01 19:33:36 +11:00
libraryaddict 9ddd0bd9cc Player now sees theirselves disguised as the same block they are disguised as. 2014-11-30 16:39:27 +13:00
libraryaddict e654b23a50 We don't need that debug output 2014-11-30 15:06:50 +13:00
libraryaddict 5157c2bf37 Disable hiders from seeing their own block 2014-11-30 15:06:18 +13:00
libraryaddict 54fe312251 Untested fix I'm 99% sure will fix hide and seek players being blinded 2014-11-30 13:47:07 +13:00
libraryaddict f8869a84ba Don't send the player himself the block change.. 2014-11-30 13:22:01 +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 00d3e66ac4 Commit my current work on SnD kits 2014-11-30 12:12:02 +13:00
libraryaddict 8afb803d5d Modify the bow kits a little 2014-11-30 10:26:12 +13:00
Jonathan Williams f507db7664 Reworked spawn to save to database.
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
libraryaddict e57bd8b473 Finish making the bow kit tree 2014-11-29 16:39:09 +13:00
libraryaddict e3b0843b2c Modify Barrage perk to support setting levels to indicate arrows 2014-11-29 16:38:54 +13:00
Chiss b3beadf8b5 made recharge look nicer for 1.7
added missing files
2014-11-29 09:14:33 +11:00
Chiss ca34ac4e02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-29 09:09:23 +11:00
libraryaddict b0e62bfedf Cleanup imports and rename fields to your _ and non _ 2014-11-29 10:51:34 +13:00
libraryaddict 24bc581f35 Add the kits I have 2014-11-29 10:36:34 +13:00
libraryaddict e587fca8f1 Move KitBow to its own package 2014-11-29 07:53:33 +13:00
libraryaddict 5544bbb440 Add KitEvolve inventory 2014-11-29 07:22:18 +13:00
libraryaddict e6fac6de39 Small typo in UpgradeKit stuff 2014-11-29 07:22:02 +13:00
Chiss 8f9f88987b mods can no longer use /tp Here
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
Chiss fdc67e021c Staff using /tp commands will take them out of the game (Mod to Admin only)
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
libraryaddict d5d9e2eb14 Don't bother with these checks in ItemLayout 2014-11-28 09:30:57 +13:00
libraryaddict d731b6ee69 Registering of KitManager 2014-11-27 09:47:43 +13:00
libraryaddict 1bb4d902c6 Start on a kit manager 2014-11-27 06:44:46 +13:00
libraryaddict 9350aeb89a Use holograms in game 2014-11-27 03:18:52 +13:00
libraryaddict f5533dbce2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy 2014-11-27 01:13:14 +13:00
libraryaddict 52411a188f Fixed entityId not using UtilEnt 2014-11-27 01:08:43 +13:00
libraryaddict b68c95c6a2 Finish up adding bombs and turn this into a working game. Add demo kit Bow 2014-11-27 01:08:42 +13:00
libraryaddict 3ae27ccc55 Store PacketHandler so that games can use it 2014-11-27 01:08:41 +13:00
libraryaddict 5bf185e588 Register Search and Destroy in GameFactory 2014-11-27 01:08:40 +13:00
libraryaddict 60fd6b01cc Add Search and Destroy code 2014-11-27 01:08:40 +13:00
libraryaddict aa0659828a Register game SearchAndDestroy 2014-11-27 01:08:39 +13:00
libraryaddict 9928811a71 Merge pull request #2 from Better-Holograms to master
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
  Remove the 'Made by Shaun'
  Fix up mistakes in the previous modifications
  You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
  Ignore wither skulls for CustomTagFix
  Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
libraryaddict ef59cb7a9d Merging changes from master to Better-Holograms
* master:
  Antistack replacement

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13: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
libraryaddict 03075fecae You have your HologramManager presented in a light most fair.
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13: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
Shaun Bennett f1fbc21570 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Jonathan Williams cb43bc04d3 Added /lobby 2014-11-23 03:35:16 -08:00
Chiss 0c5ec503be reduced fireworks in dragons 2014-11-23 15:00:05 +11:00
Chiss 089fdf8a64 sparklers no longer attract once they're in water or below 0 2014-11-23 14:55:06 +11:00
Chiss d4a127b8ad reduced fps lag in runner 2014-11-23 14:47:28 +11:00
Chiss f0c87e439a fixed nametag color in paintball 2014-11-23 11:16:01 +11:00
Chiss 19d3bba461 fixed fence glitch in dom 2014-11-22 13:20:34 +11:00
Chiss 6dfcdce027 increased illusion cooldown
cleaned axethrow
2014-11-22 10:29:00 +11:00
Chiss f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Chiss 0d78433bd2 updated mapparser
buffed withers a little
2014-11-21 10:36:41 +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
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 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 e99a3f6544 Merge remote-tracking branch 'origin/master' 2014-11-17 18:19:06 -06:00
Shaun Bennett f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Chiss cd890e6c6c disabled spec menu in minestrike - fixes shop bug. 2014-11-16 14:40:50 +11:00
Chiss 4c3610c3ac fixed DMT silence 2014-11-16 10:46:26 +11:00
Chiss 454deb03db fixed SG crash bug 2014-11-16 09:31:03 +11:00
Chiss 057594205e Only closing CREATIVE Inv for non-ops. 2014-11-15 22:40:56 +11:00
Chiss ca58f11174 specs should be able to view stats now 2014-11-15 22:32:00 +11:00
Chiss fb70b76d29 FINGERS CROSSED 2014-11-15 22:29:53 +11:00
Shaun Bennett d16896e493 Merge remote-tracking branch 'origin/master' 2014-11-15 05:04:57 -06:00
Shaun Bennett 1ca23390cc Fix my derp 2014-11-15 05:04:48 -06:00
Chiss 41b6296788 Wither no longer shoots in pregame lobby 2014-11-15 20:16:18 +11: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 223bc2d0c0 Remove some debug messages that we no longer need 2014-11-13 19:34:55 -06:00
Shaun Bennett 6038c72e86 Add cleaner page for when there is only 1 team 2014-11-13 19:33:39 -06:00
Shaun Bennett ea8b8dca15 Disable spectator menu for castle siege and uhc until I work out a better way to show that many players 2014-11-13 19:18:28 -06:00
Shaun Bennett af31f4cd42 Add Tab handling for MultiCommandBase and "game set" command 2014-11-13 18:22:00 -06:00
Shaun Bennett 48c09aa311 Making spectator gui look better 2014-11-13 18:05:28 -06:00
Shaun Bennett eb4b451e12 Fixing some spectator gui bugs 2014-11-13 16:41:42 -06:00
Shaun Bennett 8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss 112f76a29a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 18:10:10 +11:00
Chiss 9eaacd20ab fixed slime healing
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
CoderTim 09ca2234c4 Fixed survival games death match bug: https://trello.com/c/jNGSUUGI 2014-11-13 01:49:14 -05:00
CoderTim 7667aa25a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 00:26:53 -05:00
Jonathan Williams 7cad40044a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin
Work on clans.
2014-11-12 19:21:12 -08:00
CoderTim d363637015 Achievement bug fixes 2014-11-12 20:56:57 -05:00
Chiss 71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss debf8ebcba fixed chat not being unsilenced when someone picks word 2014-11-11 18:52:00 +11:00
Chiss c37026e4df SSM Dom changes 2014-11-11 18:36:32 +11:00
Chiss a1eff92bbb fixed achievement kit for sneaky not being accessible 2014-11-11 12:25:36 +11:00
Chiss d2301337d2 fixed non-charged block toss not having any velocity. 2014-11-10 19:28:36 +11:00
Chiss d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss 0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss d6ade5a15b ensured that exp cannot be given multiple times for a game 2014-11-09 14:43:06 +11:00
Chiss b65d2f491e exp gives less for losing 2014-11-09 10:33:50 +11:00
Chiss 2a04ed6eda losing games no longer gives exp 2014-11-09 10:30:26 +11:00
Chiss ad933400b9 Sheep Quest update
lowered exp on loss
removed Participation exp
2014-11-09 10:06:04 +11:00
Chiss 7e26def6a1 centralised SneakyAssassins module cleanup 2014-11-08 18:40:23 +11:00
Chiss 5ce38c3030 removed final from npcManager 2014-11-08 18:37:18 +11:00
Chiss c0ec9f92fc nulled reference too, just to be safe :D 2014-11-08 18:36:05 +11:00
Chiss 2b0befdc13 fixed listener leak in SneakyAssassins 2014-11-08 18:35:34 +11:00
Chiss fc2bba7eeb reverted idlemanager stuff for dmt(had already made talking in chat count as action) 2014-11-08 11:08:13 +11:00
Chiss 8c74022996 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 11:04:06 +11:00
Chiss 601c1912f5 may have fixed sheep teams not working. 2014-11-08 11:03:53 +11:00
CoderTim 80226a20fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:55:20 -05:00
CoderTim 4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
Chiss e286bec777 added a little msg for people in UHC, informing that it will start soon 2014-11-08 10:30:32 +11:00
CoderTim 5b1a185a5f Fixed Bad Hider achievement 2014-11-07 18:28:28 -05:00
CoderTim ae35e82e22 Disabled AFK kick in Draw My Thing 2014-11-07 18:28:06 -05:00
Chiss 75c07588a5 UHC wont start for 2 minutes after creation 2014-11-08 10:22:23 +11:00
Chiss c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Chiss 5da0c53997 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 08:56:52 +11:00
Chiss e773d44564 limited max exp so UHC doesnt give you a billion exp. 2014-11-08 08:56:30 +11:00
Jonathan Williams 4ac70281d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 13:54:22 -08:00
Jonathan Williams 3309c0406b Added ∞ for admin/owners as player level.
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
2014-11-07 13:54:11 -08:00
Chiss bd730b1e5a Fixed OITQ not giving wins.
Added silence during word selection in DMT
2014-11-08 08:46:26 +11:00