Commit Graph

12 Commits

Author SHA1 Message Date
Shaun Bennett 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
Ty Sayers 606e9e8318 Fix bug where serverId column was referenced. 2015-08-29 18:08:18 -07:00
Ty Sayers f5b9aca708 Fix bug where serverId column was being referenced in table after it's removal. 2015-08-29 18:04:50 -07:00
Ty Sayers 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
Ty Sayers 138a4cf638 Fix bug where transferring a clan to destination server would not load properly server-side. 2015-08-29 17:43:12 -07:00
Ty Sayers 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
Ty Sayers b0c657b5c0 Fix bug where generator location per-clan wasn't being reset properly on server transfer. 2015-08-29 17:33:01 -07:00
Ty Sayers 5df7a5e0c9 Fix bugs related to multiple server UI and clan server transferring. 2015-08-29 17:31:54 -07:00
Shaun Bennett 820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
Ty Sayers 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
Ty Sayers 197309b914 Commit left-over changes to merge and pull. 2015-08-29 15:44:29 -07:00
Ty Sayers aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00