Commit Graph

3166 Commits

Author SHA1 Message Date
Keir Nellyer 390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
Joseph Prezioso Jr 91e550bdcc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr a07e71ba08 GameOption takes a generic value to eliminate the need for more than the one GameOption class.
Remove the--now unnecessary--classes that inherited from GameOption.

Consequently, the creation and implementation of GameOptions should be much more efficient.

Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.

The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr f030f78f08 Add headers to new classes, so as to comply with coding standards.
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
Joseph Prezioso Jr c6c52885a9 Fixed commit 2016-04-05 15:16:40 -04:00
Ben 7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Shaun Bennett ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
Shaun Bennett fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Cheese 9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Joseph Prezioso Jr 5e1003cccb Missed a minus sign in my previous commit. 2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr 6ccc6df6aa Elo calculations now account for player's Elo, relative to the average Elo among players 2016-03-31 13:57:21 -04:00
Joseph Prezioso Jr cbb9798c35 Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd. 2016-03-31 12:49:22 -04:00
AlexTheCoder 4ae4f056ea - Map Polish 2016-03-31 03:46:43 -04:00
AlexTheCoder 40175db217 - Lots of polish 2016-03-31 03:41:07 -04:00
Joseph Prezioso Jr 6048c97b52 Tweaks to clean/clarify things 2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr 51cd770d38 Changes to help smooth the transition into using EloSettings. 2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr d8d952691b cleaning up my code a bit 2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr abcdadc8d0 Corrected a small error in GameOption. 2016-03-28 12:40:41 -04:00
AlexTheCoder 2530bc512e - Fixed some more buggies 2016-03-26 14:02:18 -04:00
AlexTheCoder bb28b7ad89 - Forgot to comment out 2 lines 2016-03-25 20:27:17 -04:00
AlexTheCoder 6678dffb61 - Updated everything for Sigils and chiss 2016-03-25 20:25:43 -04:00
Joseph Prezioso Jr 57a1e06406 no message 2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr f7575360db Setting up a class to handle Materials as GameOptions 2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr 05ede7910e All errors have been fixed. 2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr 262c6c2fa6 Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur 2016-03-25 13:53:20 -04:00
Joseph Prezioso Jr c1ef185e82 Flags have been changed and I have started to get rid of the errors that have started cropping up. 2016-03-25 12:48:39 -04:00
Joseph Prezioso Jr 667ec03f06 Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code. 2016-03-24 18:43:02 -04:00
Joseph Prezioso Jr eb6c385936 More flags changed 2016-03-24 17:52:02 -04:00
Joseph Prezioso Jr 0246ec275e More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused... 2016-03-24 17:47:07 -04:00
Joseph Prezioso Jr b5d3a6b8c3 Small fix to last commit so that everything works while I continue working on getting GameOptions working 2016-03-24 16:34:16 -04:00
Joseph Prezioso Jr 4e02258124 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-24 16:32:33 -04:00
Shaun Bennett e8dcc4a3e2 Merge branch 'develop' into clans/beta
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
Shaun Bennett a107c38f28 Comment out missing ring game kit so we can compile 2016-03-23 10:18:22 +11:00
Shaun Bennett 85cb065d5c Merge pull request #14 from Mineplex-LLC/Dual_1.9
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
Shaun Bennett 61b79fab9d Merge pull request #13 from Mineplex-LLC/PC-15
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
Jonathan Williams 750b960b46 Fixed references to snake events. 2016-03-20 16:24:11 -05:00
Jonathan Williams 109190ee58 Moved snake events to their own classes.
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
Jonathan Williams 262f659ffa Fix with TurfForts infinite while loop. 2016-03-20 15:46:57 -05:00
Jonathan Williams 3bc8dd0098 Fixed bug with infinite loop in Bridges MushroomSpawn. 2016-03-20 00:32:33 -05:00
Ben 723f62b8f9 incognito fixes and loads of other fixes 2016-03-20 01:06:46 +00:00
AlexTheCoder 3212b75e4e - Finally finished all of chiss' changes 2016-03-12 09:35:44 -05:00
Ben 86c50cc3cd updates 2016-03-11 19:03:32 +00:00
git 557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13:00
Virizion 67e844db29 Added /e bridge <seconds> PC-17 2016-03-08 21:21:53 -05:00
Ben 5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Virizion 6c0d18662f Added /e clear <player or @a> PC-16 2016-03-08 20:45:23 -05:00
Ben befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Virizion c89669aec9 Add /e announce <text> PC-15 2016-03-08 20:23:33 -05:00
git 496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
Shaun Bennett d108679d43 Fix compile error 2016-03-04 14:09:20 -06:00
git 6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
git 0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
Keir Nellyer b18f2d8682 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-03-02 20:02:09 +00:00
Shaun Bennett 3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Shaun Bennett a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
Shaun Bennett 923e51483c Remove fill line 2016-02-26 04:29:27 -06:00
Shaun Bennett 4472c52432 Fix bucket 2016-02-26 04:21:26 -06:00
William Burns 268536ce68 push 4 shaun 2016-02-26 08:13:28 +00:00
William Burns e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
William Burns dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns a97409b64a Adjust max distance for targeting. 2016-02-25 15:04:19 +00:00
William Burns 7f6517a823 Ignore barrier blocks when drawing. 2016-02-25 14:23:16 +00:00
git 2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
William Burns 19b6c3d95f Make sure the blocks are in the canvas. 2016-02-24 21:37:22 +00:00
William Burns a5060e014b Replace old paint bucket recursive filling. 2016-02-24 21:34:41 +00:00
William Burns 35a853a198 Remove redo/undo system as per request of @mightysigils. 2016-02-24 08:17:13 +00:00
William Burns 33bf3e2e6e Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update 2016-02-24 08:03:42 +00:00
William Burns 700f5ec44a Add Redo/Undo system (WIP). 2016-02-24 07:58:50 +00:00
Keir Nellyer 99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
AlexTheCoder 3b7a7e457c Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-20 03:20:27 -05:00
AlexTheCoder 0a6cdfa779 - chiss' requested changes 2016-02-20 03:18:59 -05:00
md_5 c811906a7e REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a) 2016-02-19 18:21:01 +11:00
Shaun Bennett 7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
md_5 b58ea5b51a Provide option to load config from mineplex.yml, not per game folders. 2016-02-19 15:25:09 +11:00
libraryaddict 8b1b63c8b3 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
Conflicts:
	Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
AlexTheCoder d3884bd090 - Spawn regen 2016-02-17 22:12:23 -05:00
AlexTheCoder fe849576f7 - Spawn protection 2016-02-17 22:04:20 -05:00
AlexTheCoder 4158c12227 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-17 21:44:51 -05:00
md_5 1a1c64dc51 Fix PerkMadScientist on non game zombies. 2016-02-17 18:44:49 +11:00
md_5 b5f4055269 Fix command stack trace on unitialized arcade games. 2016-02-17 18:40:24 +11:00
md_5 3fad9c639a Fix stack trace in master builders when clicking on a watch. 2016-02-17 18:39:26 +11:00
md_5 50f58ba3a5 Don't stack entities when a game isn't running. 2016-02-17 18:33:40 +11:00
md_5 628e77a701 Don't process empty chat messages. 2016-02-17 18:32:43 +11:00
md_5 e6c00b06ee Fix exception in GameChatManager if an Arcade game has not been initialized. 2016-02-17 18:29:47 +11:00
md_5 e3861d3bc0 Fix NPE in TnTGenerator 2016-02-17 18:22:37 +11:00
AlexTheCoder 9e2840b3b5 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-16 21:28:07 -05:00
AlexTheCoder efb63ee824 - fixes 2016-02-16 21:27:50 -05:00
xGamingDudex 35b9e01aff Added FlySpeed Cap to WitherAssault game 2016-02-16 19:26:00 +01:00
xGamingDudex d10dc3d7be Fixed NPE in KillsWhileEvolvingTracker for game Evolution 2016-02-16 19:22:18 +01:00
xGamingDudex 9c1e574f6a Fixed ConcurrentModificationException in PerkDeadlyBones:99 2016-02-16 19:09:06 +01:00
xGamingDudex 2f302f4892 Fixed NPE for Gladiators death event 2016-02-16 18:54:13 +01:00
xGamingDudex 2436b7084a Fixed some chat issues, especial one at GameChatManager:125 2016-02-16 18:52:18 +01:00
xGamingDudex 2d5868657a Fixed NPE in PerkVanish 2016-02-16 18:35:42 +01:00
xGamingDudex 2d3956175b Should have fixed PerkFishFlurry Block NPE on update (132) 2016-02-16 18:32:17 +01:00
xGamingDudex ad6c506361 Concurrency Exception in PerkDeathsGrasp fix 2016-02-16 18:18:47 +01:00
xGamingDudex d33905e174 Fixed NPE in MiscManager regarding hub clock tp fix for Master Builders 2016-02-16 18:09:07 +01:00
xGamingDudex f551703d9c SkyWars TNTGenerator NPE fix 2016-02-16 17:57:00 +01:00
AlexTheCoder 16c03ebb48 - Silly skeletons! Swimming is for players! 2016-02-15 21:54:18 -05:00
Shaun Bennett 37757ad7de Add TypeWars to MPS 2016-02-15 18:55:13 -06:00
AlexTheCoder 53ac1827bc Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-15 19:13:20 -05:00
AlexTheCoder 8d1b270089 - Balancing and bugs 2016-02-15 19:12:25 -05:00
Shaun Bennett 15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
AlexTheCoder f0d59755d2 - Update 2016-02-14 03:31:36 -05:00
AlexTheCoder f6c38903f2 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-13 14:34:11 -05:00
AlexTheCoder 6385aacbac - Updates 2016-02-13 14:28:39 -05:00
AlexTheCoder 138c900484 - Fixed up for more universal damage switching 2016-02-13 12:46:57 -05:00
AlexTheCoder 8b39d7ba43 - Void damage fix 2016-02-12 23:16:56 -05:00
AlexTheCoder ea893bfa48 - Fixed update 2016-02-12 23:03:38 -05:00
AlexTheCoder 197bcc9dbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
AlexTheCoder 9595a0ffae - Lot of stuff 2016-02-12 21:22:00 -05:00
Shaun Bennett 960a0cdabb Fix constructor error, add ValentinesGiftManager to Arcade 2016-02-12 05:06:13 -06:00
Shaun Bennett d51e26a5a4 Valentines game adjustments 2016-02-12 01:34:29 -06:00
Shaun Bennett d8965179f7 More valentines adjustments/fix gladiators tutorial being enabled 2016-02-11 23:01:59 -06:00
Shaun Bennett 2eeddb828b Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
* commit '51d152d48473f820ab6d03586fb41f890750f645':
  Perfect build all fix
  Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
  Stop mid game joiners from getting participation gems.
  Mob egg baby fix. Also fixed non build entities from being "broken"
  spec command add guardian
  The infamous look direction bounce bug
  Chiss' double jump mechanic
  Moar fixes
  Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
William Burns 790ed4f993 Fix tools for block type/colour selections. 2016-02-11 08:11:40 +00:00
William Burns b3045d38e7 Add colour selection for multiple block types. 2016-02-10 16:34:00 +00:00
Cheese eebe25040e cleaned the particle effects a bit 2016-02-10 16:31:25 +11:00
Shaun Bennett e3ff25526b Merge pull request #164 in MIN/mineplex from valentines/game to develop
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
  valentines final push
  bug fixes
  more valentines :)
  many valentine, such wow
  val1
2016-02-09 20:28:58 -06:00
Shaun Bennett f6e091f029 Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
* commit '57638ff68496b6f10012f8782633066b52a8a715':
  More work on valentines
  Valentines gifts
  Added love potion and hub sheep thing.
  Started on Love Potion system. Switching branches.
  Varius tweaks and changes.
  Added sheep mount to index.
  Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
Cheese 6800e4ef47 valentines final push 2016-02-09 20:43:24 +11:00
Virizion 51d152d484 Perfect build all fix 2016-02-07 19:05:53 -05:00
Virizion aaf1fd42f3 Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. 2016-02-07 18:16:36 -05:00
Virizion b40f018ee2 Stop mid game joiners from getting participation gems. 2016-02-07 17:20:58 -05:00
Virizion e96b4c4a7f Mob egg baby fix. Also fixed non build entities from being "broken" 2016-02-07 15:59:59 -05:00
Virizion 008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Virizion 7e9ff95ae3 spec command add guardian 2016-02-07 15:27:39 -05:00
Shaun Bennett a5c5a7c536 Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
  Fixed NPE
  Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
Shaun Bennett c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Mysticate 465f12e210 Fixed NPE 2016-02-07 13:27:38 -05:00
Cheese 2ab1b51401 bug fixes 2016-02-07 14:09:02 +11:00
Cheese a35a9ea31f more valentines :) 2016-02-07 13:27:53 +11:00
Virizion 2ac7840d71 The infamous look direction bounce bug 2016-02-04 23:54:54 -05:00
Virizion b0b43524da Chiss' double jump mechanic 2016-02-04 22:05:46 -05:00
Virizion a76e570b8a Moar fixes 2016-02-04 21:43:17 -05:00
Cheese 690c2acce8 many valentine, such wow 2016-02-05 13:25:57 +11:00
Mysticate c0d6cbbb85 Added various cosmetic items for Valentines day.
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
Cheese 5c22c841fe val1 2016-02-04 10:55:29 +11:00
Shaun Bennett 699a26f630 Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  mac fix
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Fixed various ways of players going invisible through Spec mode.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  ...
2016-02-03 16:06:59 -06:00
Mysticate af5cf309ca Made sure that a valid tool is used before dropping any items. 2016-02-03 14:43:14 -05:00
Keir Nellyer 27fc81dd8b Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-02-03 17:23:40 +00:00
Virizion 41ea96d505 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-01 16:42:55 -05:00
Virizion 989c324a37 Hopper item pickup fix. 2016-02-01 16:18:40 -05:00
Keir Nellyer 9601eabfeb Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
Mysticate ace7d1764c Fixed various ways of players going invisible through Spec mode. 2016-01-31 10:22:59 -05:00
Shaun Bennett 52b6779a4f Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
  Fixed explosions dropping right items.
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06:00
Keir Nellyer 8cf32ef8bf Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-30 00:46:43 +00:00
Mysticate b45e00796d Fixed explosions dropping right items. 2016-01-29 15:58:49 -05:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Mysticate 1e29bd6936 Made block define its own drops. 2016-01-29 11:44:40 -05:00
Mysticate 447583aa2a Removed an nunnecesarry method 2016-01-29 09:41:45 -05:00