Ben
|
738825ea9d
|
perms for tutoirial command
|
2016-04-05 23:37:08 +01:00 |
|
Ben
|
4bdd33c87b
|
blowing holes in the ground and interacting with cannon sometimes not working
|
2016-04-05 23:15:38 +01:00 |
|
Ben
|
744d8891b4
|
import
|
2016-04-05 22:58:03 +01:00 |
Joseph Prezioso Jr
|
09db5a8131
|
I'm committing this so I can checkout to a different branch
|
2016-04-05 16:41:50 -04:00 |
|
Joseph Prezioso Jr
|
c6c52885a9
|
Fixed commit
|
2016-04-05 15:16:40 -04:00 |
|
Ben
|
be63012d18
|
make trainees+ not count to kicked player count
|
2016-04-05 12:43:19 +01:00 |
|
Ben
|
876a7a8eb6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-05 12:37:23 +01:00 |
|
Ben
|
cfac41f216
|
full server trainee+ fix
|
2016-04-05 12:37:04 +01:00 |
Jonathan Williams
|
dd5b2d5e3f
|
Fixed NPE with poison condition effect.
|
2016-04-05 00:36:18 -05:00 |
|
Jonathan Williams
|
e23362bd6f
|
Fixed NPE in OrderedObjective
|
2016-04-05 00:36:00 -05:00 |
|
Jonathan Williams
|
b34a175a2b
|
Fixed error in Outpost throwing NPE.
|
2016-04-05 00:35:44 -05:00 |
Shaun Bennett
|
ae87db1742
|
Fix TNT generator timings
|
2016-04-05 13:04:52 +10:00 |
|
Shaun Bennett
|
23232efd63
|
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 13:04:39 +10:00 |
phobia
|
b0dd51843b
|
Ride horse delay
|
2016-04-05 10:58:31 +10:00 |
|
Ben
|
7f92a3c048
|
incognito changes
|
2016-04-05 00:38:27 +01:00 |
|
Jonathan Williams
|
cd5ad89f51
|
Made clans sort by server number.
|
2016-04-04 17:46:51 -05:00 |
|
Jonathan Williams
|
53b25e6ee0
|
Fixed diamonds not selling in shops.
|
2016-04-04 17:46:35 -05:00 |
|
Jonathan Williams
|
6558b16004
|
Fixed endless loop crash bug with Gear attributes.
|
2016-04-04 17:46:22 -05:00 |
|
Jonathan Williams
|
8ea0051181
|
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
|
2016-04-04 17:46:03 -05:00 |
|
Jonathan Williams
|
2d296d9226
|
Removed debug ResourcePack Message
|
2016-04-04 17:45:34 -05:00 |
|
Jonathan Williams
|
efa18d394b
|
Fixed Incognito not saving status.
|
2016-04-04 17:45:10 -05:00 |
|
Jonathan Williams
|
2fa0787792
|
Clans now load, added connection property to null zero date timestamps.
|
2016-04-04 16:31:37 -05:00 |
|
Jonathan Williams
|
2b3e466469
|
Removed pesky '?' causing login query to stall.
|
2016-04-04 16:30:57 -05:00 |
|
Ben
|
7de23216f6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-04 20:41:10 +01:00 |
|
Ben
|
b3b72f1ca0
|
commenting out clans bans
|
2016-04-04 20:40:58 +01:00 |
|
Jonathan Williams
|
02459c6a10
|
Fixed bad implementation of IncognitoManager that was locking up threads.
Temporarily disabled MessageManager's handling of Incognito.
|
2016-04-04 13:48:26 -05:00 |
|
Jonathan Williams
|
60010f90b4
|
Load simple clan token on player login to reduce overhead.
Increased dbpool connections to 4
|
2016-04-04 13:47:45 -05:00 |
|
Jonathan Williams
|
a91ef68978
|
Fixed CCM in WarPointEvasion.
Removed debug message; NOT RIDER
|
2016-04-04 13:46:39 -05:00 |
|
Jonathan Williams
|
e2baf2b56c
|
Updated Clans to use the new ResourcePackManager.setResourcePack method.
|
2016-04-04 13:46:00 -05:00 |
|
Jonathan Williams
|
1b1e6f6ef5
|
Moved the redis operation before asking for a mysql connection
|
2016-04-04 13:45:20 -05:00 |
|
Jonathan Williams
|
781c4bfdbd
|
Removed db call off main thread for ClanServerPage
|
2016-04-04 10:31:13 -05:00 |
|
Jonathan Williams
|
91ddac9643
|
Added world checking for boundary stuff.
|
2016-04-04 10:30:59 -05:00 |
|
Jonathan Williams
|
e8da5ca0f2
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-04 10:02:01 -05:00 |
|
Jonathan Williams
|
228a001696
|
Added Shift Left clicking to the ban list for Cannon :D
|
2016-04-04 10:01:50 -05: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 |
|
Ben
|
14207c2073
|
clansbans
|
2016-04-04 14:56:20 +01:00 |
|
Ben
|
8330ef560d
|
not rider spam
|
2016-04-04 14:55:47 +01:00 |
|
Shaun Bennett
|
fecd3c1eaa
|
Final changes
|
2016-04-04 23:28:38 +10:00 |
|
Ben
|
02cb0e1f7e
|
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/AttackEnemyObjective.java
|
2016-04-04 13:52:44 +01:00 |
|
Ben
|
1dde17b9cc
|
shooters still shotting fix
|
2016-04-04 13:51:05 +01:00 |
|
phobia
|
e85a1e6a3b
|
fixes to breakingand placing in claim
|
2016-04-04 22:22:07 +10:00 |
|
phobia
|
4262a4d4b7
|
Increase radius + delete iron doors after done
|
2016-04-04 22:07:58 +10:00 |
|
phobia
|
963bba06f7
|
fix for displaying territorial movements
|
2016-04-04 17:47:58 +10:00 |
|
phobia
|
2e0c9d3965
|
Remove potatoe message
|
2016-04-04 17:34:39 +10:00 |
|
phobia
|
aaccb6fd48
|
Join/leave/death messages
|
2016-04-04 17:20:21 +10:00 |
|
Shaun Bennett
|
15c4b2dd58
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-04 17:11:15 +10:00 |
|
Shaun Bennett
|
23e116f9b5
|
Region fixes
|
2016-04-04 17:10:52 +10:00 |
|
phobia
|
56a087612b
|
Changes to explain energy goal
|
2016-04-04 16:58:16 +10:00 |
|
Shaun Bennett
|
be8ed78caa
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-04 16:46:17 +10:00 |
|
Shaun Bennett
|
02f774ce94
|
A lot of bug fixes
|
2016-04-04 16:45:20 +10:00 |