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
Thanos paravantis
72994656dd
Improve dragon egg handling. Implement chat silence during challenge description.
2016-03-21 22:06:49 +02: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
Thanos paravantis
644e7a08bb
Bug fixes (detailed description below) and hit box improvements.
...
- Cancel teleport event to prevent the game from breaking.
- Block Lobbers: Fix falling block spawning and item drops.
- Color Change: Fix platform not spawning after first stage.
2016-03-20 23:26:55 +02: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
Thanos paravantis
f57bd37116
Rush push, cloud fall and treasure digger updates/refactoring. Added /mark command to reveal and correct misplaced spawn locations.
2016-03-20 17:20:40 +02:00
Thanos paravantis
8084897782
Rush Push: Update custom damage event listener.
2016-03-20 12:14:09 +02:00
Thanos paravantis
c080bc31ab
Refactor rush push challenge, update win placement.
2016-03-20 11:10:16 +02: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
Thanos paravantis
1a51f51f60
Refactor color change, reverse tag and treasure digger challenge.
2016-03-19 17:36:27 +02:00
Thanos paravantis
115508cf72
Refactor onChallengeUpdate method.
2016-03-19 16:14:56 +02:00
Thanos paravantis
4c8292e7c9
Update color change and reverse tag challenge, changes and improvements and spawnpoints update.
2016-03-19 16:01:42 +02:00
Thanos paravantis
dd6d128b44
Rename files to match challenge name, change kit description, refactor color change challenge.
2016-03-18 18:36:32 +02:00
AlexTheCoder
3212b75e4e
- Finally finished all of chiss' changes
2016-03-12 09:35:44 -05:00
Thanos paravantis
2f96325f0c
Challenge refactoring.
2016-03-12 11:16:37 +02: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
Thanos paravantis
1ee7a42b9c
Challenge refactoring, modify challenge ending and chat messages, add generateGrass helper method.
2016-03-07 18:32:33 +02:00
git
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
Thanos paravantis
4e6ba4ebd1
Challenge refactoring.
2016-03-06 16:45:25 +02:00
Thanos paravantis
c2d5699aa8
Challenge refactoring, bug fixes, add additional helper methods.
2016-03-06 00:59:13 +02:00
Thanos paravantis
0f58c1378c
Challenge refactoring.
2016-03-05 17:51:30 +02:00
Thanos paravantis
c30f6b0f96
Main class and challenge refactoring.
2016-03-05 17:06:07 +02:00
Shaun Bennett
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
Thanos paravantis
51d4db5e46
Implement game settings and challenge list. Add isChallengeValid and isPlayerValid for event checks.
2016-03-04 20:01:08 +02: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
Thanos paravantis
9e09d8c477
Challenge refactoring.
2016-03-02 22:54:47 +02:00
Shaun Bennett
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
Thanos paravantis
9a4f4dbd7c
Merge branch 'master' into thanos-mineware
2016-03-02 18:47:30 +02:00
Thanos paravantis
60dfce4612
Challenge refactoring, move challenges to new package.
2016-03-02 18:45:27 +02:00
Shaun Bennett
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
Thanos paravantis
cb8b180c2f
Start challenge refactoring, implement helper methods.
2016-03-01 18:50:41 +02:00
Thanos paravantis
77871e3195
Implement challenge settings and data.
2016-03-01 17:09:43 +02:00
Thanos paravantis
6570adc4af
Improve zombie on infestation challenge.
2016-02-29 22:40:09 +02:00
Thanos paravantis
dd538dedd5
Fix Lava Run challenge map generation.
2016-02-29 20:19:26 +02:00
Thanos paravantis
6a2f66f722
Challenge bug fixes and refactoring.
2016-02-29 15:07:33 +02:00
Thanos paravantis
2bc396dc17
General bug fixes and improvements, add map height preference.
2016-02-28 18:15:37 +02:00
Thanos paravantis
bcb489f13d
Map support and parse locations. Minor changes and bug fixes.
2016-02-27 00:13:02 +02:00
Thanos paravantis
1e08e1a5db
Update player death handling, add aggressive chicken behavior, minor changes and refactoring.
2016-02-26 18:17:03 +02: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
Thanos paravantis
0e697e279b
Player death handling and chicken attack changes.
2016-02-25 23:35:38 +02: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
Thanos paravantis
1dbf7581d2
Add missing game class.
2016-02-24 21:45:38 +02:00
Thanos paravantis
27daace524
Rename game type to Bawk Bawk Battles, change item display to Egg.
2016-02-24 21:43:10 +02:00
Thanos paravantis
f2d58bd55c
Player death handling and chicken attack update, working version.
2016-02-24 20:13:23 +02:00
Thanos paravantis
a7fb1df539
Experimenting with player death and chicken attack.
2016-02-24 18:10:57 +02: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
Thanos paravantis
6a234aa50f
Chicken attack and death handling progress.
2016-02-23 18:56:49 +02:00
Thanos paravantis
f1cb8378ac
Test commit
2016-02-23 14:54:12 +02: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
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
Thanos paravantis
854ebf70c4
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.classpath
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2016-02-02 17:11:22 +02:00
Thanos paravantis
96cc73fcb7
Change challenge death handling, refatoring.
2016-02-02 17:07:04 +02: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
Thanos paravantis
de1ee4f6cb
Spectator and chicken attack changes.
2016-01-31 23:50:23 +02:00
Mysticate
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
Thanos paravantis
1f22883c13
Refactoring challenge selection and updating.
2016-01-31 16:57:54 +02:00
Thanos paravantis
0e1a14a0c3
Countdown modifications, refactoring, dogs vs cats challenge changes.
2016-01-30 21:52:18 +02:00
Thanos paravantis
69dc888657
Refactoring.
2016-01-30 21:07:00 +02:00
Thanos paravantis
215fe68575
Start code refactoring.
2016-01-30 17:19:33 +02:00
Thanos paravantis
e3a9f4f2f7
Chicken attack changes, refactoring, update map crumble variable access.
2016-01-30 14:14:55 +02: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
Thanos paravantis
c5a9f0c42c
Chicken attack bug fixes, death effect improvements.
2016-01-30 00:13:41 +02: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
Thanos paravantis
0530ea28e7
Improve chicken attack, fix mini oitq arrow damage.
2016-01-29 19:15:37 +02: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