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 |
|
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
|
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 |
|
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 |
|
Jonathan Williams
|
8427ead097
|
Changed how currency types is initialized to avoid possible NPE
|
2016-03-19 15:33:16 -05: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 |
|
Ben
|
2e9562fc50
|
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
|
2016-03-18 22:31:36 +00:00 |
|
Ben
|
8c7da5e98a
|
some goals didn't commit
|
2016-03-18 03:01:42 +00:00 |
|
Ben
|
3ba138a8d7
|
some more objectives.
|
2016-03-18 03:01:11 +00:00 |
|
Ben
|
995d454f87
|
tutorial additions.
|
2016-03-18 02:47:51 +00:00 |
|
Ben
|
3b764920e1
|
duplicate messages
|
2016-03-18 01:22:15 +00:00 |
|
Ben
|
a4cbe54c78
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-18 01:21:25 +00:00 |
|
Ben
|
2cf59ced8b
|
new pvp timer management, fixed build house task, fixed incognito
|
2016-03-18 01:18:35 +00:00 |
|
Ben
|
a3db70ad9c
|
clear player inventory on tutorial start (and give map)
|
2016-03-17 09:44:03 +00:00 |
|
Ben
|
e6f4375041
|
build house goal [still broken]
|
2016-03-17 02:23:05 +00:00 |
|
Ben
|
929981419e
|
disable item dropping & block breaking
|
2016-03-17 01:52:36 +00:00 |
|
Ben
|
add651780b
|
priority chat filters, fixed siege weapon clicking listeners being incorrect
|
2016-03-17 01:06:07 +00:00 |
|
Ben
|
b164ff0729
|
Update res pack
|
2016-03-16 23:56:39 +00:00 |
|
Ben
|
1c1ed1613a
|
allow kill command while in void/after other damage methods
|
2016-03-16 23:56:30 +00:00 |
|
Ben
|
d625b20ea8
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
|
2016-03-16 22:48:04 +00:00 |
|
Ben
|
93767b7a90
|
tutorial changes, chat filter system, commented out all web stuff for analytics.
|
2016-03-16 22:46:18 +00:00 |
|
Ben
|
2c9021fb81
|
some chat formatting
|
2016-03-16 22:31:35 +00:00 |
|
Joseph Prezioso Jr
|
7cf49dbe3b
|
Refactored code to correct errors from previous commit
|
2016-03-15 20:46:30 -04:00 |
|
Joseph Prezioso Jr
|
5fdd3e0872
|
Updated North, South, East, and West Spawns and Centers
|
2016-03-15 20:12:09 -04:00 |
|
Ben
|
0d237370e1
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-15 23:33:09 +00:00 |
|
Ben
|
7589c63904
|
analytics progress
|
2016-03-15 23:32:56 +00:00 |
|
Ben
|
8897f2e86e
|
fixed NPE
|
2016-03-15 23:11:08 +00:00 |
|
Ben
|
4638ba909d
|
siege weapon finalizations & analytics (wip)
|
2016-03-15 22:52:13 +00:00 |
|
Keir Nellyer
|
25075597f2
|
Only allow Ultra+ players to use /report whilst it's in beta testing.
|
2016-03-15 17:43:16 +00:00 |
|
Shaun Bennett
|
4e85a315f9
|
Objectives!
|
2016-03-15 11:50:35 -05:00 |
|
Shaun Bennett
|
e53b8616d1
|
A ton of tutorial work
|
2016-03-15 10:29:43 -05:00 |
|