JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,393 Commits 1 Branch 0 Tags 481 MiB
5bce1b5f2e
Commit Graph

4393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mini-Chiss
519e668d62 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 11:01:23 -07:00
Jonathan Williams
47331658ac Merge remote-tracking branch 'remotes/origin/Myst_EVO' 2015-08-30 00:14:53 -07:00
Jonathan Williams
b59511ece4 Added duplicate login kick for network. 2015-08-30 00:12:54 -07:00
Mini-Chiss
e8b3085ec5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-29 23:55:18 -07:00
Mini-Chiss
d944d2e5c4 Merge branch 'Myst_EVO' 2015-08-29 23:54:28 -07:00
Ty Sayers
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
Ty Sayers
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
Ty Sayers
c1b356e42f Fix asynchronous race conditions in ServerData. 2015-08-29 19:05:14 -07:00
libraryaddict
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
libraryaddict
cbab8861d8 SNakes!! 2015-08-29 18:58:33 -07:00
Mini-Chiss
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
Mini-Chiss
368ed955ea qwrwr 2015-08-29 18:58:12 -07:00
Ty Sayers
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
Ty Sayers
36a22caa1e Fix bug where lastOnline stat for clans wasn't properly loading on server transfer. 2015-08-29 18:23:04 -07:00
Ty Sayers
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
Ty Sayers
4e045f438d Prevent fire from burning blocks in spawn areas. 2015-08-29 18:12:43 -07:00
Ty Sayers
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
Ty Sayers
606e9e8318 Fix bug where serverId column was referenced. 2015-08-29 18:08:18 -07:00
Ty Sayers
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
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
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
Ty Sayers
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
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
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
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
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
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
4dbd2d3586 Reduce login kick time 2015-08-29 17:28:47 -07:00
Shaun Bennett
caf82ad606 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-29 17:18:24 -07:00
Shaun Bennett
c27fdf023c Fix login manager and stats manager 2015-08-29 17:18:14 -07:00
libraryaddict
f4ade8e9f7 Snnkes 2015-08-29 17:05:47 -07:00
Shaun Bennett
820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
Mini-Chiss
50b6bfbe1a snake 2015-08-29 16:54:23 -07:00
Mini-Chiss
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
Mini-Chiss
6bd29394b3 snake 2015-08-29 16:46:55 -07:00
libraryaddict
e2e0756b9f Snakes anyone? 2015-08-29 16:43:40 -07:00
Mini-Chiss
05ecfb8ff0 snake workin! 2015-08-29 16:33:35 -07:00
Mini-Chiss
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
Mini-Chiss
64b9cd201c snake crap 2015-08-29 16:02:14 -07:00
Ty Sayers
c754e41492 Merge pull request #49 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit '227a077dba76a4199b7cf4b5768298e353e2d376':
  Commit left-over changes to merge and pull.
  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.
  Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones.
 2015-08-29 17:54:24 -05: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
Shaun Bennett
5db4a55dda Enable clans login manager 2015-08-29 15:41:37 -07:00
Shaun Bennett
16b317a877 Forgot to remove debug code 2015-08-29 15:17:03 -07:00
Shaun Bennett
9ad39c1fe7 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-29 15:09:08 -07:00
Shaun Bennett
4aee4f8fd7 Fix generators 2015-08-29 15:09:02 -07:00
libraryaddict
6ae801314c Fix spawning 2015-08-29 15:07:51 -07:00
libraryaddict
9a1469f6b0 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-29 15:03:32 -07:00