24fed013ae
Fixed previous ownership not being transferred
2015-08-31 15:39:04 -04:00
32a257fa55
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
2015-08-31 15:11:57 -04:00
b63843930f
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-08-31 15:08:42 -04:00
503b68da2f
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-08-31 11:32:47 +02:00
58ae09ebd4
saving Project for pulling.
2015-08-31 11:32:18 +02:00
c61f9ce3c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-31 00:53:23 -07:00
740899c09e
Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird
...
Fixes Lobby crashes.
2015-08-31 00:53:07 -07:00
7c53feec71
Add axes and bows to murder detection
2015-08-30 17:59:46 -07:00
becfbe1f13
Fixed possible game breaking bug :S
2015-08-30 20:09:47 -04:00
fa0fd062d4
Allow Media to join server, Supply drop work
2015-08-30 17:08:56 -07:00
894a46edf9
Merge pull request #59 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'eba98e7e7cd5998eae096cbdf77bbcafcc3af740':
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 19:07:10 -05: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
d79794c6d3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-30 15:47:57 -07:00
bb66d47e8e
meow
2015-08-30 15:47:49 -07:00
33d78a5efd
Fixed eating spider eye. Yay!
2015-08-30 18:39:07 -04:00
b0efe35531
Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub.
2015-08-30 13:14:01 -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
5347b8a1aa
Merge pull request #58 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'ab73cc2fbed1fe8d2c80eb217ace19da19ad1f11':
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 14:29:59 -05: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
519e668d62
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-30 11:01:23 -07:00
47331658ac
Merge remote-tracking branch 'remotes/origin/Myst_EVO'
2015-08-30 00:14:53 -07:00
b59511ece4
Added duplicate login kick for network.
2015-08-30 00:12:54 -07:00
e8b3085ec5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-29 23:55:18 -07:00
d944d2e5c4
Merge branch 'Myst_EVO'
2015-08-29 23:54:28 -07:00
e7255bbb53
Merge pull request #57 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '7047bbf8f69c36c535f0bb63812218b0b62c1afd':
Fix asynchronous race conditions in ServerData.
2015-08-29 21:07:03 -05: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
e371b75401
Merge pull request #56 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '36a22caa1e3bcfffab75655a1dce268f1ea3821c':
Fix bug where lastOnline stat for clans wasn't properly loading on server transfer.
2015-08-29 20:24:05 -05:00
36a22caa1e
Fix bug where lastOnline stat for clans wasn't properly loading on server transfer.
2015-08-29 18:23:04 -07:00
ac3850631f
Merge pull request #55 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '4e045f438de4603a95994a9856d0c60791ce0314':
Prevent fire from burning blocks in spawn areas.
2015-08-29 20:13:02 -05:00
4e045f438d
Prevent fire from burning blocks in spawn areas.
2015-08-29 18:12:43 -07:00
d71bf52a2e
Merge pull request #54 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '606e9e8318c750836d870fa21c1a297f94b2c724':
Fix bug where serverId column was referenced.
2015-08-29 20:08:32 -05:00
606e9e8318
Fix bug where serverId column was referenced.
2015-08-29 18:08:18 -07:00
a136d703d6
Merge pull request #53 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'f5b9aca70897190d4de70b1865483d8c95fd88ef':
Fix bug where serverId column was being referenced in table after it's removal.
2015-08-29 20:05:10 -05:00
f5b9aca708
Fix bug where serverId column was being referenced in table after it's removal.
2015-08-29 18:04:50 -07:00
175de7e593
Merge pull request #52 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'da3810e5a3450ae31fd7d211d4fdca8b9f7de2e8':
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 19:57:49 -05:00
f21f1ca93e
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 17:57:27 -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
8c509c5bd1
Merge pull request #51 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '138a4cf6380316ff60ca9d51defcd1a72f18449a':
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 19:43:31 -05: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
7284093786
Merge pull request #50 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'f47c1b5c144cdc143d1d3750b970edd63373d5d6':
Fix bug where generator location per-clan wasn't being reset properly on server transfer.
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 19:33:42 -05: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
AlexTheCoder
Sarah
Jonathan Williams
Shaun Bennett
Mysticate
Ty Sayers
Ty Sayers
Mini-Chiss
libraryaddict