libraryaddict
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
libraryaddict
4205dc6c25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
Ty Sayers
590b8e4d25
Merge pull request #69 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '36050b41bccf1fac5f5631c84db6fee37b02bc48':
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 15:09:50 -05:00
Ty Sayers
36050b41bc
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-10-14 16:08:22 -04:00
Ty Sayers
98ec99cffc
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 16:06:34 -04:00
Cheese
1c52bd4f64
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-14 14:34:51 +11:00
Cheese
86bad0be30
mods can check other players skills
2015-10-14 14:34:30 +11:00
Shaun Bennett
0df637b80a
Run punishBot in main server thread
2015-10-13 22:56:14 -04:00
Shaun Bennett
39d88e8060
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/botspam/BotSpamManager.java
2015-10-13 22:26:11 -04:00
Shaun Bennett
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
Mysticate
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
Cheese
45cd2a38e1
admins can botspam
2015-10-14 11:55:59 +11:00
Shaun Bennett
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
Shaun Bennett
cb0d82174e
Apply botspam to chat messages as well
2015-10-13 17:41:25 -04:00
Cheese
1842eae7f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 23:22:58 +11:00
Cheese
d105ea5d7e
botspam addition
2015-10-13 23:19:48 +11:00
libraryaddict
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
AlexTheCoder
e1d8b25e91
- Fix misc champs bugs
2015-10-13 01:24:57 -04:00
Jonathan Williams
a292fdb3c5
Added failsafe for ServerMonitor.
2015-10-12 22:26:24 -05:00
Cheese
f5b80c941c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 11:58:27 +11:00
Cheese
e8388437b6
botspam now checks for chat as well
2015-10-13 11:58:14 +11:00
Cheese
981002e3dc
Merge branch 'Myst_HALLOWEEN'
2015-10-13 11:23:38 +11:00
Cheese
3e5ac58ae9
helpers!
2015-10-13 11:23:00 +11:00
Cheese
37639a413c
fixed skill stuff
2015-10-13 11:22:10 +11:00
AlexTheCoder
0bd026f506
- Fixed merge issues
2015-10-12 18:04:35 -04:00
AlexTheCoder
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
Mysticate
be96842de5
Ultra
2015-10-12 17:02:34 -04:00
AlexTheCoder
dceba51060
- Fix random blockhunt bug with mounts and infestor
2015-10-12 03:09:40 -04:00
AlexTheCoder
bbb863ba92
- Merge conflict patch
2015-10-12 02:36:10 -04:00
Cheese
2b9a66e7b2
more ssm update
2015-10-12 16:32:23 +11:00
Shaun Bennett
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -04:00
AlexTheCoder
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
Cheese
6a173073a4
added flag to projectiles
...
work on cow kit
2015-10-12 14:39:14 +11:00
libraryaddict
dab258dcdd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Libraries/BungeeCord.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
Mysticate
3eb36a6581
Prevented farming
2015-10-11 22:43:21 -04:00
Mysticate
2abf3edad4
Made items for titanic cosmetics dyes.
2015-10-11 22:29:26 -04:00
Mysticate
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
Cheese
e180e0ae78
Merge branch 'Myst_HALLOWEEN'
2015-10-12 12:29:05 +11:00
Mysticate
dda65b4c77
Fixed tnt exploding lobbies
2015-10-11 19:56:36 -04:00
Mysticate
20dd9c683b
Merge remote-tracking branch 'origin/master' into monster-maze
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
Mysticate
606937d227
Fixed flashbang glitch
2015-10-11 09:42:36 -04:00
Jonathan Williams
e6485a9009
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 23:02:36 -06:00
Jonathan Williams
5866e0cce6
Reducing max connections for the DBPool to 3.
2015-10-10 23:02:08 -06:00
Cheese
f23bf18928
adhering to mysts OCD
2015-10-11 14:50:57 +11:00
Cheese
f3e2f3c145
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-11 14:48:17 +11:00
Cheese
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
Mysticate
435e74225a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-10 23:35:33 -04:00
Mysticate
83d1e011fc
Changes.
2015-10-10 23:33:54 -04:00
Jonathan Williams
998d5f6984
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 21:25:29 -06:00
