Ben
c381cc8fd7
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 21:14:34 +00:00
Ben
cfb84dd545
fixes for shaun
2016-03-24 21:14:13 +00:00
Shaun Bennett
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11: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
Ben
f000360565
missing a few files
2016-03-24 19:29:45 +00:00
Ben
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
Ben
7920f2729b
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 08:59:09 +00:00
Ben
2eb4d89875
i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages.
2016-03-24 08:58:48 +00:00
Shaun Bennett
4e26d2c7f1
Push code for ben
2016-03-24 19:37:56 +11:00
Shaun Bennett
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
Shaun Bennett
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
Jonathan Williams
105f62e563
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-23 16:02:30 -05:00
Jonathan Williams
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
Shaun Bennett
3d473ad00a
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-23 20:39:21 +11:00
git
4dd756286e
Fix small resource pack bug
2016-03-23 20:32:13 +13: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
1e73adf2af
Increase ram and cpu for event server
2016-03-23 10:23:04 +11:00
Shaun Bennett
656780d027
Change runAsync in MiniPlugin to use our own thread pool
...
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
2016-03-23 10:22:40 +11:00
Shaun Bennett
da9a642a6d
Process item for treasure before opening
2016-03-23 10:21:36 +11:00
Shaun Bennett
309b5464f2
Clean up Account Repository, attempt to load account ID from cache
2016-03-23 10:21:02 +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
Jonathan Williams
c9fdd83e17
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-21 20:31:04 -05:00
Jonathan Williams
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
Ben
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00: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
md_5
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
md_5
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
Jonathan Williams
b4dfeb224b
Reduced NCP exempt time by .5s.
2016-03-21 02:06:11 -05:00
Ben
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
Jonathan Williams
faf6834e23
Added some protection for stacker and offline players.
2016-03-20 16:27:59 -05: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
Jonathan Williams
8427ead097
Changed how currency types is initialized to avoid possible NPE
2016-03-19 15:33:16 -05: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
Ben
ef1d6ede24
many fixes
2016-03-19 06:31:37 +00:00
Ben
a21d43e58f
fix NPE
2016-03-19 06:13:39 +00:00
Ben
c4fbae4bd1
added clan name blacklist and changed clans ban GUI
2016-03-19 06:11:32 +00:00
Ben
6172be5d76
few changes
2016-03-19 00:13:31 +00:00
