e8725b38ab
Colorize the messages for when a /game start fails
2015-09-25 14:06:35 +12:00
452e8a9694
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-19 12:11:21 +12:00
655283e008
Progress on spider
2015-09-14 23:23:12 +12:00
0bafae6485
Fix bug where certain damage events threw excessive NPEs based on spawn protection checks.
2015-09-11 17:09:50 -05:00
9be0ecc598
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java
Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.
2015-09-11 17:01:04 -05:00
b4248a3d5b
Fix bug where Assassins could teleport outside of the Borders (causing their death) with several skills. Fix bug where crafting denials for certain items were not properly communicated to the user. Clean up use-cases for cancelling fishing to prevent players from not being able to use their class abilities. Fix bug where pigs could be struck my lightning using class abilities, spawning in pig zombies that could be farmed for gold.
2015-09-11 16:04:52 -05:00
15b51fe575
Fix bug where Fissure skill travelled through doorways as well as increase cooldown. Fix bug where Cobwebs could be thrown inside spawn safe zones and increase cooldown. Modify StaticLazer skill's range, damage, cooldown, and damage radius for balance purposes. Remove the ability to craft TNT Minecarts and Jukeboxes. Disable fishing ability in Clans. Add the requirement that players must crouch while clicking on furnaces to be able to smelt. Fix bug where Axes weren't considered a weapon in the context of player murders.
2015-09-07 20:39:34 -05:00
6474f5a9e9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-06 16:23:18 +12:00
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
7c53feec71
Add axes and bows to murder detection
2015-08-30 17:59:46 -07:00
fa0fd062d4
Allow Media to join server, Supply drop work
2015-08-30 17:08:56 -07:00
eba98e7e7c
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-30 17:05:57 -07:00
6bb4e69236
Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies.
2015-08-30 17:05:45 -07:00
1b6833ae16
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-30 12:41:22 -07:00
5d77202370
Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss
2015-08-30 12:41:15 -07:00
ab73cc2fbe
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-30 12:28:55 -07:00
54f910845e
Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop.
2015-08-30 12:28:44 -07:00
908d11ead5
Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query
2015-08-30 12:00:58 -07:00
7047bbf8f6
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 19:06:20 -07:00
c1b356e42f
Fix asynchronous race conditions in ServerData.
2015-08-29 19:05:14 -07:00
4b7a4a4d5c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 18:58:43 -07:00
cbab8861d8
SNakes!!
2015-08-29 18:58:33 -07:00
bcdd72558d
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 18:58:21 -07:00
368ed955ea
qwrwr
2015-08-29 18:58:12 -07:00
36a22caa1e
Fix bug where lastOnline stat for clans wasn't properly loading on server transfer.
2015-08-29 18:23:04 -07:00
4e045f438d
Prevent fire from burning blocks in spawn areas.
2015-08-29 18:12:43 -07:00
606e9e8318
Fix bug where serverId column was referenced.
2015-08-29 18:08:18 -07:00
f5b9aca708
Fix bug where serverId column was being referenced in table after it's removal.
2015-08-29 18:04:50 -07:00
da3810e5a3
Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.
2015-08-29 17:57:18 -07:00
138a4cf638
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 17:43:12 -07:00
f47c1b5c14
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 17:33:08 -07:00
b0c657b5c0
Fix bug where generator location per-clan wasn't being reset properly on server transfer.
2015-08-29 17:33:01 -07:00
5df7a5e0c9
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 17:31:54 -07:00
4dbd2d3586
Reduce login kick time
2015-08-29 17:28:47 -07:00
caf82ad606
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 17:18:24 -07:00
c27fdf023c
Fix login manager and stats manager
2015-08-29 17:18:14 -07:00
f4ade8e9f7
Snnkes
2015-08-29 17:05:47 -07:00
820bc1af44
Setup new module for intellij, fix field ore
2015-08-29 16:56:26 -07:00
50b6bfbe1a
snake
2015-08-29 16:54:23 -07:00
a76610e21e
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java
2015-08-29 16:47:47 -07:00
6bd29394b3
snake
2015-08-29 16:46:55 -07:00
e2e0756b9f
Snakes anyone?
2015-08-29 16:43:40 -07:00
05ecfb8ff0
snake workin!
2015-08-29 16:33:35 -07:00
110222e5f3
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 16:02:21 -07:00
64b9cd201c
snake crap
2015-08-29 16:02:14 -07:00
227a077dba
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
2015-08-29 15:53:42 -07:00
197309b914
Commit left-over changes to merge and pull.
2015-08-29 15:44:29 -07:00
5db4a55dda
Enable clans login manager
2015-08-29 15:41:37 -07:00
16b317a877
Forgot to remove debug code
2015-08-29 15:17:03 -07:00
9ad39c1fe7
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 15:09:08 -07:00
libraryaddict
Ty Sayers
Shaun Bennett
Mini-Chiss