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

208 Commits

Author SHA1 Message Date
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
Mini-Chiss fbaec460dc removed debug 2015-08-05 20:26:50 +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
Shaun Bennett 2305e8bbaa Store Kills, Deaths, Murders, Wins, Losses in database 
Add Murder
 2015-07-29 01:48:49 -05:00
Ty Sayers 13f47ad903 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/items/CustomItem.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
 2015-07-24 13:59:01 -05:00
Ty Sayers 0b49d053fe Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events. 2015-07-20 15:57:57 -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
Shaun Bennett 2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Shaun Bennett 5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05:00
Ty Sayers 2ffe2badf2 Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans. 2015-06-22 16:20:20 -04:00
libraryaddict 8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +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
libraryaddict 3a6c030f01 ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something 2015-06-04 16:01:52 +12:00
Ty Sayers 2e19aabfa1 Convert damage system to custom Mineplex damage events to enable legendary abilities. Fix NPE and hanging issue on ServerData's serialization adapter. Finalize item generation logic for instantiating CustomItem's based on specified random distribution of types, attribute counts, etc. Fix several Legendary bugs discovered during testing. Clean left-over template documentation and further clarify ambiguous methods. Add proper updating logic for custom items to track internal stats in hidden json lore. Add safe-logout system to prevent combat logging and enable players to safely log after a designated amount of time. Tweak WindBlade's flight speed to a more natural value. 2015-06-01 12:25:20 -04: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
libraryaddict 12b3a582b2 CustomExplosion: Fixed loop, added max damage 2015-04-12 23:21:19 +12:00
libraryaddict 81aeff86bf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-12 20:15:28 +12:00
Cheese d290078790 Damage multipliers now effect damage modifiers - this also fixes a bug! 2015-04-11 16:33:18 +10: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 2d59bb4010 CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?) 2015-04-11 12:12:47 +12:00
libraryaddict 290767c58d CustomExplosion: Added method to change to customdamage, added method to change the block damage differently from the entity damage 2015-04-03 19:36:47 +13: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 8bd883cb26 fixed damage transfer for mama pigglez kit 2015-04-01 17:43:46 +11:00
libraryaddict b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict d3e37d4578 CustomExplosion & explosion/Explosion.java: Add option to use falling block explosions on CustomExplosion by option in Explosion to only spawn falling blocks, not remove blocks so that CustomExplosion can handle that 2015-03-25 20:32:03 +13:00
libraryaddict 2d4dcdbd8e CustomExplosion: Add method to change block explosion size separately 2015-03-25 19:26:25 +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
libraryaddict 41469b198a Change wizards spells to use conditions for potion effects 2015-03-17 18:07:43 +13:00
libraryaddict 03d77abed3 Don't allow people holding gold ingots to deal a lot of damage 2015-03-17 17:49:10 +13:00
libraryaddict f4b6a53adb Add Wither to ConditionFactory 2015-03-15 12:36:18 +13:00
Cheese c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Shaun Bennett efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
libraryaddict 53bb67ec4f Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits 2015-02-21 20:41:07 +13:00
Mini-Chiss 26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
libraryaddict 76e6b7530f Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts 2015-01-26 09:09:46 +13:00
libraryaddict c5b444ae6e Wizards push 2015-01-23 21:52:03 +13:00
libraryaddict dd2418232c Wizards progress 2015-01-21 19:00:07 +13:00
libraryaddict 611d184024 Cleanup code, add custom explosion, add lance and traprune spell 2015-01-18 21:23:47 +13: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 ec8e1f0546 more MPS stuff 
fixed bridges exploit
 2014-12-22 16:31:13 +11:00
Chiss eba54c6b8a Removed hub snake parkour 2014-12-22 10:21:58 +11:00
Chiss 184c6cb4ba added func to change attackreason for combatmanager 2014-12-19 13:59:18 +11:00
libraryaddict 6d7a71d043 Modifications for SnD test 2014-12-16 15:14:07 +13: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 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
Jonathan Williams df76f6be10 More work on Clans. 2014-11-15 01:13:14 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
Chiss aa45f031ac 3 new achievement Kits 
SSM Balance patch
Champs balance
tons of bug fixes
 2014-10-31 10:35:47 +11:00
CoderTim cd5e4234b7 Fixed a couple more achievement bugs 
Track damage mods in combat log
 2014-10-27 19:00:34 -04:00
CoderTim 2a18888922 Improved NpcManager to work with persistent maps 2014-10-14 22:22:17 -04:00
CoderTim 3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Chiss 9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Chiss e2c72a3ae2 HH update 2014-10-11 14:28:00 +11:00
CoderTim f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04:00
Shaun Bennett e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05: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 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Chiss 2170f743dd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-13 08:42:57 +10:00
CoderTim 49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04: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
Jonathan Williams 75b44953bf Fixed arrow bounce. 2014-04-21 00:12:00 -07:00
Chiss b1e082b73a fixed riposte bug 
tweaked capture effects
 2014-04-21 11:56: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
Chiss 3281eb2ed7 Merge 2014-04-21 08:47:07 +10: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
Chiss 85aa748218 Champs Bug Fixes 2014-04-13 17:20:49 +10:00
Chiss f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Chiss ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Jonathan Williams 0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams e4ca9084cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:03:41 -07:00
Jonathan Williams ec29c66d1c Added arrows sticking in you. 
Removed bouncing arrows.
 2014-04-09 02:03:19 -07:00
Chiss 0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Chiss bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Chiss 13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss 26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss 2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams 2450265909 Fixed damage rate limiting for mobs. 2014-03-22 00:16:51 -07:00
Jonathan Williams 33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Jonathan Williams f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams 7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Chiss 6f06ac2018 HG lag fixes 
item frames cannot be broken
creep damage messages
 2013-11-26 23:54:02 +11:00
Chiss 48e392fdf0 HG; 
-compass
-deathmatch
-various fixes
 2013-11-25 20:59:46 +11:00
Chiss 24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Chiss 52ac670f3f More dom changes 2013-10-31 12:43:54 +11:00
Chiss 4974fc17aa Halloween balance (slightly easier) 
Giant hitbox improved
 2013-10-27 15:24:28 +11:00
Chiss 1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Chiss 064dd97d00 HitBox support for disguises 
Squid hitbox added
Changed squid swimming!
 2013-09-24 08:56:09 +10:00
Jonathan Williams 85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -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 9fe33bab84 Added UHC 
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
 2013-09-09 18:06:44 +10:00
Chiss 768f57ae5e SSM: Added Wither Skeleton and Creeper kits 
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
 2013-09-05 13:55:42 +10:00
Jonathan Williams 63d2563f92 Added Disguise hurt sounds. 
Enabled disguised hurt sounds in DamageManager
 2013-09-01 23:28:07 -07:00
Chiss c483d869a5 Added SSM Spider and Squid Kit 
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
 2013-09-02 14:40:06 +10:00
Chiss 789a26471d smash stats Perk 2013-09-02 09:51:53 +10:00
Chiss e17368a9ac >.< Updates 2013-08-31 13:15:16 +10: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