b4d340a655
cb fixed
2016-03-27 06:21:32 +01:00
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
a30a591b58
disable certain clans commands whilst in tutorial
2016-03-27 02:04:33 +01:00
a8bd0e4406
add current Clan Outpost to travel shop
2016-03-26 23:20:03 +00:00
2070f0925d
teleport to spawn after tutorial ends
2016-03-26 22:49:06 +00:00
0559ad9567
remove "you have not set a home" message and added a set home message
2016-03-26 22:45:20 +00:00
23cfa8ec25
mine diamonds fix (have to mine 11 instead of 10)
2016-03-26 22:36:27 +00:00
f201898420
mine diamond fix
2016-03-26 22:35:06 +00:00
970d5a307c
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-27 09:17:39 +11:00
bace0b2557
Add Mining shop Location
2016-03-27 09:14:12 +11:00
9e0ba029b4
uhhh what
2016-03-26 22:10:19 +00:00
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
c1adb7e1bc
Remove Slack attachment functionality (for now).
2016-03-26 13:12:59 -04:00
29966195ee
Create an API for sending Slack message to multiple teams and channels.
2016-03-26 13:07:41 -04:00
a35bbeefdd
attack enemy goals
2016-03-25 12:38:01 +00:00
dade54e5fe
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-25 04:02:16 +00:00
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
8c7d653cca
Store location for teleport home
2016-03-25 13:13:15 +11:00
8afed30c5a
basic classes objectives
2016-03-25 13:07:53 +11:00
d23804be70
fixes for shaun
2016-03-25 01:33:55 +00:00
87b1bf7dd0
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
2016-03-25 01:30:46 +00:00
3cd7a5f12a
NPE fix for cannons and more
2016-03-25 01:29:55 +00:00
c221e0e24f
Fix potatoes
2016-03-25 12:26:13 +11:00
17c214c282
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java
2016-03-25 00:08:28 +00:00
88b0ea1b72
tutorial progressss es
2016-03-25 00:06:51 +00:00
d5a89dc7fe
Push for ben again
2016-03-25 11:05:05 +11:00
7c06186a4f
Fix cleanup and setup
2016-03-25 09:42:41 +11:00
628604c353
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-25 08:44:08 +11:00
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
af87dc9384
unsynchronized siege weapon support
2016-03-24 21:26:40 +00:00
c381cc8fd7
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 21:14:34 +00:00
cfb84dd545
fixes for shaun
2016-03-24 21:14:13 +00:00
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
f000360565
missing a few files
2016-03-24 19:29:45 +00:00
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
7920f2729b
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 08:59:09 +00:00
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
4e26d2c7f1
Push code for ben
2016-03-24 19:37:56 +11:00
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
105f62e563
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-23 16:02:30 -05:00
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
3d473ad00a
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-23 20:39:21 +11:00
4dd756286e
Fix small resource pack bug
2016-03-23 20:32:13 +13:00
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
1e73adf2af
Increase ram and cpu for event server
2016-03-23 10:23:04 +11:00
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
da9a642a6d
Process item for treasure before opening
2016-03-23 10:21:36 +11:00
309b5464f2
Clean up Account Repository, attempt to load account ID from cache
2016-03-23 10:21:02 +11:00
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
c9fdd83e17
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-21 20:31:04 -05:00
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00:00
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
b4dfeb224b
Reduced NCP exempt time by .5s.
2016-03-21 02:06:11 -05:00
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
faf6834e23
Added some protection for stacker and offline players.
2016-03-20 16:27:59 -05:00
750b960b46
Fixed references to snake events.
2016-03-20 16:24:11 -05:00
109190ee58
Moved snake events to their own classes.
...
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
262f659ffa
Fix with TurfForts infinite while loop.
2016-03-20 15:46:57 -05:00
3bc8dd0098
Fixed bug with infinite loop in Bridges MushroomSpawn.
2016-03-20 00:32:33 -05:00
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
8427ead097
Changed how currency types is initialized to avoid possible NPE
2016-03-19 15:33:16 -05:00
ef1d6ede24
many fixes
2016-03-19 06:31:37 +00:00
a21d43e58f
fix NPE
2016-03-19 06:13:39 +00:00
c4fbae4bd1
added clan name blacklist and changed clans ban GUI
2016-03-19 06:11:32 +00:00
6172be5d76
few changes
2016-03-19 00:13:31 +00:00
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
8c7da5e98a
some goals didn't commit
2016-03-18 03:01:42 +00:00
3ba138a8d7
some more objectives.
2016-03-18 03:01:11 +00:00
995d454f87
tutorial additions.
2016-03-18 02:47:51 +00:00
3b764920e1
duplicate messages
2016-03-18 01:22:15 +00:00
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
2cf59ced8b
new pvp timer management, fixed build house task, fixed incognito
2016-03-18 01:18:35 +00:00
a3db70ad9c
clear player inventory on tutorial start (and give map)
2016-03-17 09:44:03 +00:00
e6f4375041
build house goal [still broken]
2016-03-17 02:23:05 +00:00
929981419e
disable item dropping & block breaking
2016-03-17 01:52:36 +00:00
add651780b
priority chat filters, fixed siege weapon clicking listeners being incorrect
2016-03-17 01:06:07 +00:00
b164ff0729
Update res pack
2016-03-16 23:56:39 +00:00
1c1ed1613a
allow kill command while in void/after other damage methods
2016-03-16 23:56:30 +00:00
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
93767b7a90
tutorial changes, chat filter system, commented out all web stuff for analytics.
2016-03-16 22:46:18 +00:00
2c9021fb81
some chat formatting
2016-03-16 22:31:35 +00:00
7cf49dbe3b
Refactored code to correct errors from previous commit
2016-03-15 20:46:30 -04:00
5fdd3e0872
Updated North, South, East, and West Spawns and Centers
2016-03-15 20:12:09 -04:00
0d237370e1
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-15 23:33:09 +00:00
7589c63904
analytics progress
2016-03-15 23:32:56 +00:00
8897f2e86e
fixed NPE
2016-03-15 23:11:08 +00:00
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
4e85a315f9
Objectives!
2016-03-15 11:50:35 -05:00
e53b8616d1
A ton of tutorial work
2016-03-15 10:29:43 -05:00
d7de4381a3
add 200ms damage delay to cannon damages. and add temporary damage holograms
2016-03-15 00:49:37 +00:00
813a3833ae
implement temporary holograms
2016-03-15 00:48:50 +00:00
13bbcc51dc
remove cannon pickup feature
2016-03-15 00:23:59 +00:00
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
c556d7b3c3
fix ConcurrentModificationException
2016-03-15 00:21:15 +00:00
864b12adbf
make cannons explode chest items
2016-03-15 00:20:40 +00:00
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
422df69335
incognito async stuff and updated alpha holograms
2016-03-11 21:50:48 +00:00
bdfb55d4e1
nevermind [revert leap change]
2016-03-11 21:22:01 +00:00
bfdb7add2e
run siege weapon queries async
2016-03-11 21:04:22 +00:00
1008c58e91
removed catapult code as it's very out of date at this point (and it's not being used hehe)
2016-03-11 19:33:02 +00:00
eb0da6552c
add C.cBlue to name of Outposts & Cannons.
2016-03-11 19:31:24 +00:00
523c194c56
Fix data values not being correct in shop page.
2016-03-11 19:31:05 +00:00
d1c7879224
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-11 19:08:40 +00:00
45a0853564
remove test classes
2016-03-11 19:07:11 +00:00
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06:00
2aa68d3e16
final stuff and map
2016-03-11 04:14:16 +00:00
a27fb90c2a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 02:21:03 +00:00
0e276474c5
fixerroooniissssss
2016-03-11 02:20:18 +00:00
01ba099d74
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:38 +00:00
c9eb2c9559
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:31 +00:00
57c65cf5ff
some changes and vanish fixes maybe?
2016-03-11 01:47:14 +00:00
8ce32fcdfa
little tweakers
2016-03-11 00:58:47 +00:00
a568db6d90
remove eclipse file
2016-03-11 00:43:30 +00:00
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
33d978c6d6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-10 22:12:41 +00:00
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
76782fd420
Fix issues
2016-03-10 15:07:22 -06:00
c2f6217d9f
allowed sr. mods to use /we (TEMP)
2016-03-10 17:38:16 +00:00
0fd0a7fb44
mak esupply drop beacons more specific
2016-03-10 17:38:03 +00:00
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
2d2e88e069
some fixes and updates
2016-03-10 02:47:48 +00:00
9b40496a1e
siege weapon picking up
2016-03-09 23:56:25 +00:00
4955abb519
Hopefully, ELO Rating will be grabbed from the correct column now...
2016-03-09 17:12:04 -05:00
1532abcc62
disable nether and legendary fixes
2016-03-09 21:12:02 +00:00
70aa5d63fd
touched up on some messages
2016-03-09 13:10:39 +00:00
51e5552e2d
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-09 11:56:25 +00:00
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
e3fb40805c
all siege items shouldn't be able to be placed or used while on PvP timer.
...
Fixes to Jagged prefix
2016-03-09 22:46:45 +11:00
67e844db29
Added /e bridge <seconds> PC-17
2016-03-08 21:21:53 -05:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
b1c8158e2f
Added @a argument to /shard, /gem and /giveitem PC-13
2016-03-08 19:52:31 -05:00
059b964f22
eloRating now after warLosses so that it matches better with the SQL table
2016-03-08 17:06:13 -05:00
19375e5720
callEvent now has a return type
2016-03-08 16:20:53 -05:00
ac91ba690c
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 16:08:14 -05:00
b8f06374cd
Made changes to accommodate for Clan ELO's
2016-03-08 16:07:52 -05:00
abdf61de0a
*more fixes*
2016-03-08 21:02:25 +00:00
af8f0fff16
vanish error fixes
2016-03-08 21:00:19 +00:00
69091c079f
Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 20:58:11 +00:00
9b65926d42
Fix rank monthly rewards description
2016-03-08 13:26:26 -06:00
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -05:00
1f09616784
chat packet listener
2016-03-08 18:28:54 +00:00
99c2fefed2
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:27:45 -06:00
3283b873e7
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-08 12:19:28 -06:00
26b7ea2d59
fixes
2016-03-08 18:19:12 +00:00
876a568bd0
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-03-08 12:17:07 -06:00
ffd9d98d2e
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:15:47 -06:00
e39b3de237
Fix errors
2016-03-08 12:12:44 -06:00
86ef10456c
packet hnadler beginning, switching to clans to fix errors
2016-03-08 18:10:57 +00:00
890a3f4bc9
Merge develop into clans/beta
2016-03-08 12:09:04 -06:00
f24e196efd
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-08 18:07:57 +00:00
6b61d4aecd
Disable Alpha Manager.
2016-03-08 18:03:07 +00:00
036565abb7
more
2016-03-08 17:44:15 +00:00
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
0f752fb7e3
Fix custom names in 1.9
2016-03-08 16:11:12 +13:00
d86ef81056
weaps oops
2016-03-08 01:11:16 +00:00
263e3e7768
forgot to push
2016-03-08 01:07:35 +00:00
9953388b92
iunvseeeeeeeeeeee
2016-03-08 00:32:36 +00:00
48cfe4d91c
fixed & inv see?
2016-03-08 00:27:06 +00:00
280d03daa7
Fix names
2016-03-08 09:52:30 +13:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
ae42aaaab1
Sammy changes + cleanup
2016-03-07 03:25:22 +00:00
7e2086df1c
flash fix, rares update, and outpost fixes
2016-03-06 19:55:58 +00:00
ae2da31544
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
8cfbe20a08
re-added delay to /spawn
2016-03-05 23:09:57 +00:00
d92f817efc
fixed some teleportation bugs and a bit of cleanup
2016-03-05 22:50:06 +00:00
e88736c1aa
changes to scepter, NPE fix
2016-03-05 20:46:24 +00:00
d79107eaaa
new legendary weapons and nether finzlizations
2016-03-05 03:07:25 +00:00
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
7b9ff288f3
nether progresssisiannsnsssss
2016-03-03 23:23:20 +00:00
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
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
0284fed2a9
Update patch
2016-02-28 13:12:59 +13:00
775b6eeffa
Merge pull request #7 from Mineplex-LLC/feature/dmt-update
...
Draw My Thing Update
2016-02-26 04:38:10 -06:00
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
9a8c410448
Fix lore being null.
2016-02-25 15:39:18 +00:00
009d48659b
Add commands for naming items.
2016-02-25 15:29:47 +00:00
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
fcc3e8e024
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:15:12 +13:00
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
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
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00:00
d524645ddd
placed the clan name hologram thingy correctly because it's inside the outpost!!!
2016-02-23 19:11:29 +00:00
d65bf965c4
fix only some blocks of outpost being reset and explosion particles not showing up
2016-02-23 18:51:34 +00:00
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
879a211a41
change siege weapon damage indicator display length
2016-02-23 17:00:14 +00:00
deb22fd4e7
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
2016-02-23 16:54:07 +00:00
205e3885b8
disallow players on pvp timer to use bows
2016-02-23 16:14:56 +00:00
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
bcd4480f23
stop recruits from opening trapped chests
2016-02-23 15:57:12 +00:00
306e56980c
remove weapon teleport fix
2016-02-23 14:44:07 +00:00
de4568d448
accurate-ish weapon damage tracking
2016-02-23 13:03:50 +00:00
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
76cf65c267
siege system changes
2016-02-22 09:34:04 +00:00
db7382d01e
testing github?
2016-02-21 01:34:13 +00:00
3a73b05895
Fix for ServerMonitor not loading database config
2016-02-20 00:48:30 -06:00
82d51a896f
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
2016-02-19 19:54:06 -06:00
8d7453b78e
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 19:33:52 -06:00
7032568a92
Add PLAYER_STATS DBPool
2016-02-19 19:33:39 -06:00
a84f8dd2d0
Fix dbcp, tone down sentry
2016-02-19 20:28:22 +11:00
81f9ca0bc2
Fix mysql
2016-02-19 20:10:01 +11:00
6e2eea50bb
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 02:46:25 -06:00
d575266522
Fix sentry
2016-02-19 19:44:36 +11:00
3b10207503
Class.forName!
2016-02-19 02:40:14 -06:00
d3d22bbec9
Merge pull request #168 in MIN/mineplex from clans/alpha to develop
...
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
remove more eclipse files
remove eclipse files
moar undead fixes
Fixes to observer settings
Clans Alpha 1.0 changes
WP Evade
More alphs bug fixes
Fixes to flame and broadsword
Clans alpha bug fixes
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
Fixes to TntProtection
Added safe zone protection for flame
finalized alpha patches
alpha fixes
raised war points for invasion to 25
Fixes to war point evasion
Added fix to WarPoint evasion bug + 1 dmg bug
that's not needed
MAVEN TEST COMMIT
Fixed issues with Broadsword Added max building height of 100
...
2016-02-19 01:30:09 -06:00
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
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
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
dc5fe21f3d
more npe checking
2016-02-18 21:53:55 +00:00
24b834370b
null pointers with siege weaponl oading
2016-02-18 21:37:13 +00:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
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
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
c20e32d2c0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-16 16:55:11 -06:00
684a40db41
Fix giving TITAN in Staff Server
2016-02-16 16:55:00 -06:00
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11:00
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
904798ec22
Delete libraries directory/old craftbukkit jar (now in Patches folder)
2016-02-15 18:10:44 -06:00
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
d1e098ca13
Merge remote-tracking branch 'origin/develop' into develop
2016-02-15 20:44:52 -06:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
Ben
Shaun Bennett
William Burns
Jonathan Williams
git
Shaun Bennett
Joseph Prezioso Jr
phobia
Virizion
md_5