JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,651 Commits 1 Branch 0 Tags 481 MiB
c5cbca3ed0
Commit Graph

1212 Commits

Author SHA1 Message Date
Shaun Bennett
31f083387d Use Castle icon on travel page 2015-11-26 23:42:16 -05:00
NewGarbo
174825776b meow clams 2015-11-27 04:39:04 +00:00
NewGarbo
9dcc048953 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:23:14 +00:00
NewGarbo
6119500b68 changes 2015-11-27 04:23:02 +00:00
Shaun Bennett
faaa1fcf0b Use castle clan icon for /c <clan> 2015-11-26 23:15:14 -05:00
NewGarbo
5744178286 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:06:02 +00:00
NewGarbo
dbda29e3f3 magnetic maul fixes 2015-11-27 04:05:47 +00:00
NewGarbo
73f4450fa3 clans fixes 2015-11-27 04:04:29 +00:00
Shaun Bennett
ef511f1704 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 22:38:03 -05:00
Shaun Bennett
6da10950da Update clan icons, fix client class 2015-11-26 22:37:54 -05:00
NewGarbo
0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
NewGarbo
e849484670 bunch of changes and fixes and bugs and stuff and things 2015-11-26 23:59:47 +00:00
NewGarbo
055702b36e changes and fixes and woo 2015-11-26 23:08:33 +00:00
NewGarbo
56d4b34969 fixed formatting on death notices. 
Made world event middle texts longer lasting.
Fixed logout NPC timer
 2015-11-26 21:57:26 +00:00
NewGarbo
5393d1d18c Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 21:16:21 +00:00
Shaun Bennett
6e416b1059 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
 2015-11-26 16:12:54 -05:00
Shaun Bennett
27e214a643 Region fix 2015-11-26 16:12:29 -05:00
NewGarbo
dd33d9587d made power recharge a tad faster with Wind Blade 2015-11-26 21:12:09 +00:00
NewGarbo
0aaee24600 fixed gear UI display stuff incorrectly 2015-11-26 21:06:33 +00:00
NewGarbo
bb3ea0115d fixed classes not loading 2015-11-26 20:41:42 +00:00
NewGarbo
67a28a94fb bunch of fixes 2015-11-26 20:32:01 +00:00
Keir
edf93ec43f Initial ChatSnap implementation. 2015-11-26 16:55:27 +00:00
NewGarbo
2bce722539 some code polishing. fixed some mispositioning with Spawn holograms. 2015-11-26 13:29:40 +00:00
NewGarbo
e5fa59b8da Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 13:17:28 +00:00
NewGarbo
009ddaaee1 stop players in tutorial from receiving/sending chat. 2015-11-26 13:16:50 +00:00
NewGarbo
bbfd319bcd Spawn holograms 2015-11-26 13:14:10 +00:00
NewGarbo
1ce2a362c6 disallow item frames being rotated in Spawn 2015-11-26 12:34:12 +00:00
NewGarbo
be19c17fee fixed gem -> gold conversion rate 2015-11-26 12:33:29 +00:00
NewGarbo
9aaad0b4a1 fixed formatting in /spawn command 2015-11-26 12:31:55 +00:00
Shaun Bennett
bdc08676d9 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
 2015-11-26 03:34:33 -05:00
Shaun Bennett
d4f3786b1c Fixes 2015-11-26 03:31:03 -05:00
NewGarbo
94a0f3244d corrected typo in WindBlade.java 2015-11-26 07:53:37 +00:00
NewGarbo
af0df835b8 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
 2015-11-26 07:52:35 +00:00
NewGarbo
97e903f403 updated regions 2015-11-26 07:51:10 +00:00
Shaun Bennett
75ff5bb3da Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 02:46:56 -05:00
NewGarbo
c0cfdf9785 fixed windblade not recharging whilst jumping 2015-11-26 07:29:39 +00:00
NewGarbo
e80c1097b5 corrected regions 2015-11-26 07:08:30 +00:00
NewGarbo
0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
Shaun Bennett
6de7b8a73e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 01:46:43 -05:00
NewGarbo
972a2d151a simplified combat log npc title 2015-11-26 06:21:01 +00:00
NewGarbo
f92849f796 that doesn't do what i thought it did 2015-11-26 05:32:59 +00:00
NewGarbo
1e4b6b4d0f fixed formatting error in clan tip 2015-11-26 05:30:13 +00:00
NewGarbo
7da8b8e3bf fix players hurting each other in safe zones 2015-11-26 05:29:35 +00:00
NewGarbo
48ebfc219d removed travel npcs from shops 2015-11-26 05:24:33 +00:00
Shaun Bennett
389956240b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 00:20:41 -05:00
NewGarbo
76d009e0de Unstuck (Spawn) command 2015-11-26 05:18:18 +00:00
NewGarbo
33cdd5400d fixed some coloring issues 2015-11-26 04:32:41 +00:00
Shaun Bennett
8f14c8beae Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
 2015-11-25 23:26:29 -05:00
Shaun Bennett
7a663b4f7b Fix legendaries 2015-11-25 23:24:07 -05:00
NewGarbo
8bd1f4b3c8 reduced hyper axe damage. OP as heck 2015-11-26 04:21:30 +00:00
NewGarbo
abcee009dd stuff 2015-11-26 04:07:33 +00:00
NewGarbo
670afc17ef clans chat is being weird 2015-11-26 03:26:15 +00:00
NewGarbo
5230b25dfd fixed suicide command (?) 2015-11-26 03:24:48 +00:00
NewGarbo
4f275d79fa fixed staff tags only displaying if player is in clan 2015-11-26 03:19:40 +00:00
NewGarbo
5fb58b1dad added suicide command 2015-11-26 03:17:05 +00:00
NewGarbo
8a64a2f4ce fixed world events spawning floating on grass and other boundless blocks 2015-11-26 03:06:27 +00:00
NewGarbo
b43cf0b28a got rid of enchanted effect on rare items 2015-11-26 03:00:59 +00:00
NewGarbo
7e23f896ca changes 2015-11-26 02:49:01 +00:00
NewGarbo
a19ade0739 rain rain go away 2015-11-26 00:53:01 +00:00
Shaun Bennett
c150ea6175 Potatoes and Tornadoes 2015-11-25 19:08:13 -05:00
Shaun Bennett
cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05:00
NewGarbo
c5211e0368 buuugs 2015-11-25 17:40:12 +00:00
NewGarbo
9a8fba543d auto-replanting trees 2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
NewGarbo
7e9dc7968e gear gui fixes and legendaries changes 2015-11-25 01:32:05 +00:00
NewGarbo
3a6dab7224 stuff 2015-11-25 00:55:11 +00:00
NewGarbo
3cb22c8cb7 uuid bug fixed finally! 2015-11-25 00:47:35 +00:00
NewGarbo
aa52c1be27 custom item stuff 2015-11-25 00:14:34 +00:00
NewGarbo
6220ce14fe Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-24 23:04:24 +00:00
NewGarbo
98edd0a452 dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours 2015-11-24 23:03:19 +00:00
NewGarbo
81c2d2a11f *just pushing my current changes so that i can start fresh on recoding custom item serialization stuff* 2015-11-24 22:49:28 +00:00
NewGarbo
31afe9f886 removed debug message from undead camp 2015-11-24 22:29:20 +00:00
Shaun Bennett
57302221df Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-24 17:27:46 -05:00
Shaun Bennett
cb7422b4fe Re-enable world events 2015-11-24 17:27:35 -05:00
NewGarbo
befe4d129d formatted PlayerGear.java (to avoid further confusion) 2015-11-24 22:21:01 +00:00
NewGarbo
459e1beeff clans buggy fixers 2015-11-24 22:18:48 +00:00
NewGarbo
8559a63887 Added all rank names to Clans name blacklist 2015-11-23 22:10:29 +00:00
NewGarbo
3fa0beceb7 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-23 21:39:53 +00:00
Shaun Bennett
ef7c26c04c Clans changes 2015-11-23 15:57:13 -05:00
NewGarbo
91067535db changed getting started tutorial gold reward to be proper (5000 now) 2015-11-23 18:09:50 +00:00
NewGarbo
175a6bc31a cleaned up world event times stuff 2015-11-23 17:24:17 +00:00
NewGarbo
9bae314278 fixed null pointer exception when interacting with a block when your clan home is null 2015-11-23 17:19:00 +00:00
NewGarbo
6ca4d12d98 fixed potential nofall exploit with logout npc 2015-11-23 17:09:51 +00:00
NewGarbo
ce2e616c74 fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-; 2015-11-23 16:57:50 +00:00
NewGarbo
da2c7d84a4 tutorial code cleanup. removed qa reset command 2015-11-23 11:19:23 +00:00
NewGarbo
a551e89310 fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT 2015-11-23 09:44:35 +00:00
NewGarbo
58ed9e586c turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial 2015-11-23 09:04:30 +00:00
NewGarbo
47abbfbedf implemented skip tutorial being permanent 2015-11-22 20:01:54 +00:00
Keir
f0e24468d5 Enable reporting functionality for Arcade and Clans plugins. 2015-11-22 14:23:17 +00:00
NewGarbo
2e047b54c2 removed stone weapons from loot 2015-11-22 11:54:38 +00:00
NewGarbo
0cdee95b87 formatted some classes 2015-11-22 11:23:19 +00:00
NewGarbo
17e62f1f5a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-20 18:31:37 +00:00
NewGarbo
fb04fac0f6 removed debug message 2015-11-20 18:31:14 +00:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
NewGarbo
521aa8d965 fixed furnaces in undead camp 2015-11-20 09:14:57 +00:00
NewGarbo
08f683aa98 gave Archers in undead camps the barbed arrows effect 2015-11-20 07:49:28 +00:00
Shaun Bennett
c29fd242ca Forgot to remove the unnecessary check 2015-11-19 14:46:01 -05:00
Shaun Bennett
f47a61e38e Use bounds for energy tracker messages aren't displayed multiple times 2015-11-19 14:44:03 -05:00
Shaun Bennett
63e580404c Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
 2015-11-19 14:36:08 -05:00
Shaun Bennett
3820035762 Cleaning up duplicate code/small optimizations (untested) 2015-11-19 14:35:59 -05:00
NewGarbo
b0c60fd1f4 sparkly rare items! woo. and fixed gold dropping waaayyy too much 2015-11-19 19:03:51 +00:00
NewGarbo
7d8e1b517d Fixed dropped gold stacking... 2015-11-19 08:56:07 +00:00
NewGarbo
f262a22913 Fixed loot dropping in King of the Hill not dropping correct items/ 2015-11-19 08:54:59 +00:00
NewGarbo
6372dfd629 fixed ArithmeticException / 0 in ClansEnergyTracker. 2015-11-19 08:29:50 +00:00
NewGarbo
0a667afeb1 finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching 2015-11-18 22:27:01 +00:00
NewGarbo
eded09b1a9 fixed yet another bug with beds... argh it seems to be working fine now. 2015-11-18 21:02:39 +00:00
NewGarbo
6f3693f804 more bug fixes 2015-11-18 19:32:20 +00:00
NewGarbo
924504ac9f fixed clans home NPE. also added GRASS to UtilItem's item property system. 2015-11-18 19:03:44 +00:00
NewGarbo
16eecdd112 fixed clan energy alerts going off incorrectly 2015-11-18 17:30:45 +00:00
NewGarbo
5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
NewGarbo
5c383a1df3 cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy 2015-11-18 12:24:28 +00:00
NewGarbo
9eaffc8acf Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on. 2015-11-18 12:17:00 +00:00
NewGarbo
cd0ce57691 replaced useless looping with just checking the rotation of the bed. 2015-11-18 09:58:06 +00:00
NewGarbo
1ea87b8354 Fixed an NPE when destroying a Clan's Home 2015-11-18 09:37:32 +00:00
NewGarbo
03764ad480 removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff. 2015-11-18 08:40:24 +00:00
NewGarbo
f5e12e5014 formatted ClansGame.java (separate commit because confusion otherwise) 2015-11-18 08:37:34 +00:00
NewGarbo
77f234e5f5 Made energy warnings stay for longer 2015-11-18 08:32:48 +00:00
NewGarbo
185f19fb6a fixed clan energy warnings being sent to all players on the server instead of the clan. 2015-11-18 08:13:13 +00:00
NewGarbo
6da628abe1 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-18 07:40:35 +00:00
NewGarbo
f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
Shaun Bennett
4f63d90bac Only show player location for allies/self 2015-11-17 18:42:06 -05:00
Shaun Bennett
01a57dde2f Fix formatting of ally messages 2015-11-17 18:39:15 -05:00
Shaun Bennett
52c55335fa Add chunk to unclaim map 2015-11-17 18:33:21 -05:00
Shaun Bennett
ab8f9cb992 Fix map color 2015-11-17 18:31:38 -05:00
Shaun Bennett
4183f0ce07 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
 2015-11-17 18:05:17 -05:00
Shaun Bennett
f6cfc36e9f War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard 2015-11-17 17:59:35 -05:00
NewGarbo
c23b2f54f5 Removed arbitrary boundary around admin territories (Chiss' request) 2015-11-17 22:41:51 +00:00
NewGarbo
9b866145ea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-17 22:24:58 +00:00
NewGarbo
31906b025f Clans Home switched over to using physical beds. 
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
 2015-11-17 22:24:19 +00:00
Shaun Bennett
6187b5e680 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-16 17:34:47 -05:00
Shaun Bennett
c3cd0e3ad2 Fix chat formatting, open clan shop with /c 2015-11-16 17:31:24 -05:00
libraryaddict
f95bec0f15 Fix up mapmanager, untested 2015-11-17 11:30:04 +13:00
Shaun Bennett
a153ffdc38 Fix enchant tables opening the wrong gui 2015-11-16 17:29:25 -05:00
Shaun Bennett
5b30cfb67e Fix War Points bug 2015-11-16 17:27:56 -05:00
NewGarbo
0d372cefaa Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-16 19:41:46 +00:00
NewGarbo
181642e200 give undead warriors stone swords. 2015-11-16 19:41:09 +00:00
Shaun Bennett
07f92d2e6e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
 2015-11-16 14:39:47 -05:00
Shaun Bennett
2627aa9933 War/War Points Update 2015-11-16 14:37:32 -05:00
NewGarbo
580ec27738 hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces. 2015-11-15 21:03:48 +00:00
NewGarbo
c6f73d6e9a oh deary me, i appear to have gone on a rampage of changing everything to interfaces. 2015-11-15 21:01:27 +00:00
NewGarbo
24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00:00
NewGarbo
fff248ad86 king of the hill gold drop fix 2015-11-15 20:37:37 +00:00
NewGarbo
5209cf3d38 fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself. 2015-11-15 20:04:44 +00:00
NewGarbo
10eb1bb9c9 enum change didn't commit in the last commit ugh 2015-11-15 19:57:16 +00:00
NewGarbo
22ae67ba81 king of the hill changes. (renamed enum for it for ease of typing) 2015-11-15 19:57:00 +00:00
NewGarbo
c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
NewGarbo
1d8366487b Fixed King of the Hill from not working at all, and some other tiny fixes 2015-11-15 14:33:29 +00:00
NewGarbo
33d358ac6a Quick fix in EventTerrainFinder because of incorrect block checking. 
Added a constant "GOLD_PER_TICK" in the King of the Hill code, because hardcoded numbers are no fun.
Commented out some strange useless code.

Renamed getTicks() to getTicksRunning() and _ticks to _ticksRunning.
 2015-11-15 12:09:31 +00:00
NewGarbo
1398987ff7 Removed currently unused world event types. 2015-11-15 08:49:44 +00:00
NewGarbo
321d840cfd Throwing RuntimeException instead of legacy assert expression. 2015-11-15 08:28:57 +00:00
Shaun Bennett
f90b137ccd Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-14 16:46:03 -05:00
NewGarbo
e4981c7491 Undead camp finishing stuff 2015-11-14 20:30:37 +00:00
Shaun Bennett
487f974951 Clan Gui updates and code cleanup 2015-11-13 23:53:34 -05:00
NewGarbo
8a972075da Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits) 2015-11-13 21:19:50 +00:00
NewGarbo
a0ac15dec5 Allowed Jr.Devs to start/clear world events. 2015-11-13 21:01:09 +00:00
NewGarbo
98be3a51a0 Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event. 2015-11-13 21:00:08 +00:00
NewGarbo
010f30f064 Made the alpha login message only send one (forgot to save the task manager stuff) 2015-11-13 20:57:33 +00:00
Shaun Bennett
8ba9a8f6c4 Fix border radius 2015-11-12 22:38:26 -05:00
Shaun Bennett
40138b6914 1.8 fix 2015-11-12 22:35:56 -05:00
Shaun Bennett
f3e94cc035 Map fix (probably broken?!) 2015-11-12 21:35:01 -05:00
Shaun Bennett
bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett
994a9e3e43 Clans Gui Work, commiting so I can switch branches 2015-11-11 18:05:48 -05:00
AlexTheCoder
d654f1f4b1 - Fixed class edit in lobbies 
- Fixed conflict between rave suit and assassin
 2015-11-10 06:17:25 -05:00
NewGarbo
1aef7fe0b9 bunch of fixes reported by qa in tutorials. 2015-11-09 20:46:38 +00:00
NewGarbo
f1fbe086d3 oh how fun, even more constructor errors! 2015-11-09 20:29:52 +00:00
NewGarbo
af6e28f14b don't you worry Shaun, I gotcha back with fixing them constructor problems ;) 2015-11-09 20:29:27 +00:00
Shaun Bennett
8850737f71 Fix constructor issues 2015-11-09 15:22:15 -05:00
Shaun Bennett
0bb3f8adb1 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/.idea/dataSources.xml
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-11-09 14:41:16 -05:00
Shaun Bennett
610b5dbeb2 More work on gui 2015-11-09 14:39:52 -05:00
NewGarbo
0409d7ffef Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-09 08:48:12 +00:00
NewGarbo
4232a5675f fixed bug with part 5 of the getting started tutorial (has to do with claiming events) 2015-11-09 08:45:34 +00:00
NewGarbo
8f507c4b9c typo 2015-11-09 08:29:51 +00:00
Shaun Bennett
ffc389f9c7 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 19:58:12 -05:00
Shaun Bennett
af1d91913b Clans gui work 2015-11-07 19:58:03 -05:00
NewGarbo
9a70d33b17 Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI. 2015-11-07 20:26:43 +00:00
Shaun Bennett
addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
NewGarbo
b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
NewGarbo
7675b00999 Dominance event. Shaun will have to call the new events once he's done with Dominance. 2015-11-06 07:11:06 +00:00
NewGarbo
1375623625 Added alpha messages. 2015-11-04 17:03:52 +00:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
NewGarbo
8033b40011 made math in GearPage a tiny bit more understandable 2015-11-04 01:27:33 +00:00
NewGarbo
ed1e394a84 removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... *shudders* 2015-11-04 00:09:46 +00:00
NewGarbo
a455804dce some Tutorial code cleanup 2015-11-04 00:07:32 +00:00
NewGarbo
4bf92ce0a0 gah why isn't this working?! git is annoying!!! 2015-11-03 23:47:35 +00:00
NewGarbo
78ab895a14 Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. 
Made it so that players using the broadsword's effects cannot attack anything.

Added small smoke particle to UtilParticle.

Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.

Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.

Removed some debug messages thrown around the code.
 2015-11-03 19:49:14 +00:00
Shaun Bennett
4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
NewGarbo
27c6ef4e9d Success! Finished all events woohoo! 2015-11-02 10:16:13 +00:00
NewGarbo
0bc8413430 test 2015-11-02 10:11:54 +00:00
NewGarbo
74c0eac141 Bunch of fixes and new stuff: 
Cleaned up code everywhere.
Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops)
Removed the tutorialManager access from ClansManager, as it is unneeded now.

Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.)

Fixed NPE in TutorialTask#onFinish(Player);
 2015-11-02 08:04:38 +00:00
NewGarbo
baa4a744fb Fixed a whole load of bugs: 
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
 2015-10-31 23:11:12 +00:00
NewGarbo
878f7aeafd Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you. 2015-10-30 22:48:40 +00:00
NewGarbo
f54da4ee78 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-30 22:20:33 +00:00
NewGarbo
396ce75087 Bug fixes/Additions: 
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
 2015-10-30 22:13:19 +00:00
Shaun Bennett
401350e85d Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-29 13:14:33 -04:00
Shaun Bennett
364d8b05af Fix war invasion 2015-10-29 13:14:27 -04:00
NewGarbo
66a4b148e1 Fixed put on armour task being inconsistent. 2015-10-29 13:44:11 +00:00
NewGarbo
0c5e34ad84 Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones! 2015-10-29 12:56:00 +00:00
NewGarbo
d0bfb2e2e9 Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event. 2015-10-29 08:35:24 +00:00
NewGarbo
8ce50d1fc7 Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.) 2015-10-28 17:08:48 +00:00
NewGarbo
765fb4ce11 Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items. 
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
 2015-10-28 07:34:13 +00:00
NewGarbo
8d5b6e6d90 Don't show weakling particles above players that are not alive. Also removed debug message. 2015-10-27 10:18:14 +00:00
NewGarbo
1938bcf799 Fixed the "weakling" status not updating correctly. 2015-10-27 10:01:33 +00:00
NewGarbo
b4897e91fa Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately. 2015-10-27 08:56:41 +00:00
NewGarbo
234799e55e Fixed infinite recursion in AlligatorsTooth. 
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
 2015-10-27 08:32:21 +00:00
NewGarbo
c30ece9d8b Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS 2015-10-26 19:48:20 +00:00
NewGarbo
da058881f8 Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH) 
added alligators tooth particles & sound
added wind blade power feature
 2015-10-26 15:37:44 +00:00
NewGarbo
eb350a79c3 Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing. 2015-10-26 12:21:33 +00:00
NewGarbo
63406e9ce1 Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore. 2015-10-26 07:57:00 +00:00
NewGarbo
7eab57c5dd As per Chiss' request, made the gear ui go to next page when you choose an attribute. 2015-10-26 07:49:03 +00:00
NewGarbo
cc2aae9726 Final touches to the gear gui, making it now completely finished. hooray! 2015-10-26 00:08:03 +00:00
NewGarbo
63bc492f2c Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code. 2015-10-24 20:36:53 +01:00
NewGarbo
089c4420b2 Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code. 2015-10-24 07:16:13 +01:00
NewGarbo
0c29805756 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-23 19:27:13 +01:00
NewGarbo
11b836da8b Added Join/Quit messages. 
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
 2015-10-23 16:59:30 +01:00
Shaun Bennett
fd1638a572 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-23 02:17:57 -04:00
Shaun Bennett
5944b734be More war fixes - still needs tweaking 2015-10-23 02:17:47 -04:00
NewGarbo
4c381d41fe Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place. 2015-10-23 06:10:09 +01:00
NewGarbo
18d998fc04 Fixed colors cutting out in the middle of the message in task information, moar fireworks! 2015-10-23 05:56:53 +01:00
NewGarbo
825b519890 Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks." 
Removed unused imports, and other code cleanup stuff.

Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
 2015-10-21 21:50:46 +01:00
NewGarbo
bf406493e3 Fixed tutorial tasks that rely on territory entrances not working because formatting... 2015-10-21 20:14:35 +01:00
Shaun Bennett
00a689ea03 War work 2015-10-21 14:48:27 -04:00
NewGarbo
112f34c77f Fixed NullPointerException when clicking outside of inventory GUI. 2015-10-21 08:10:53 +01:00
NewGarbo
a5df50de92 On going map tutorials started and finished. 2015-10-21 06:55:06 +01:00
NewGarbo
eb203131a7 Fixed import errors since I moved the getting started tutorial to a different package. 2015-10-21 06:19:23 +01:00
NewGarbo
bd5266251b Finalized the getting started tutorial. 
Added the last 5 tasks, and added a nice big ending (fireworks)

Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
 2015-10-21 06:17:18 +01:00
NewGarbo
c6cf47ee4e I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops. 2015-10-21 04:36:47 +01:00
NewGarbo
227e9f7bfc Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. 
CHANGES----

Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.

Coded in the functionality of 7 tasks, will do the rest now.
 2015-10-21 04:27:14 +01:00
NewGarbo
a2278297de Created the base for tutorials, and created the getting started tutorial. 
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
 2015-10-19 17:16:48 +01:00
Shaun Bennett
0a3f942575 Fix compile issue 2015-10-18 12:42:56 -04:00
Shaun Bennett
177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-10-18 12:35:31 -04:00
Shaun Bennett
523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
Shaun Bennett
589c05f8c0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
 2015-10-16 14:25:31 -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
Shaun Bennett
f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Ty Sayers
17fbd42b9c Fix bug where a players inventory was not properly updated after switching to SURVIVAL mode, causing CustomGear items to remain unhidden an JSON encoded. 2015-10-02 14:30:39 -04:00
Ty Sayers
661bba3714 Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description. 2015-10-02 13:57:46 -04:00
Shaun Bennett
5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Shaun Bennett
b8cc967fb0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-30 19:32:33 -04:00
Ty Sayers
b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
Ty Sayers
ab1ac379a7 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-09-29 17:36:51 -04:00
Ty Sayers
bc7615a5c3 Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players. 2015-09-29 17:36:42 -04:00
Shaun Bennett
f8ef46abde Merge master code into clans 2015-09-28 21:41:05 -04:00
Shaun Bennett
14027b9780 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-09-28 21:03:00 -04:00
libraryaddict
e94eb056dc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-25 14:09:18 +12:00
Ty Sayers
3a8fd18d2e Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8. 2015-09-22 15:28:06 -05:00
Shaun Bennett
86420132ce Clan name->uuid changes 2015-09-21 20:05:16 -04:00
libraryaddict
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
Shaun Bennett
6a4c9061fa Supply drop, loot, small fixes 2015-09-17 22:19:45 -04:00
Ty Sayers
0bafae6485 Fix bug where certain damage events threw excessive NPEs based on spawn protection checks. 2015-09-11 17:09:50 -05:00
Ty Sayers
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
Ty Sayers
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
Ty Sayers
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
libraryaddict
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
libraryaddict
21d9f5767e CustomTagFix support changing and removing of names. 2015-09-04 19:23:33 +12:00
Shaun Bennett
7c53feec71 Add axes and bows to murder detection 2015-08-30 17:59:46 -07:00
Shaun Bennett
fa0fd062d4 Allow Media to join server, Supply drop work 2015-08-30 17:08:56 -07:00
Ty Sayers
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
Ty Sayers
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
Shaun Bennett
1b6833ae16 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-30 12:41:22 -07:00
Shaun Bennett
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
Ty Sayers
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
Ty Sayers
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
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
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
4e045f438d Prevent fire from burning blocks in spawn areas. 2015-08-29 18:12:43 -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
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
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
c27fdf023c Fix login manager and stats manager 2015-08-29 17:18:14 -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
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
4aee4f8fd7 Fix generators 2015-08-29 15:09:02 -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
Shaun Bennett
8f1da698d2 TNT generator storage in mysql (needs testing still) 2015-08-29 14:37:35 -07:00
Shaun Bennett
62cf58bd55 Fix a bug where claiming a new land would display that land as neutral 2015-08-29 13:56:26 -07:00
Shaun Bennett
fae27df496 Add ClansLoginManager, TNT Generators (Still needs persistence) 2015-08-29 13:35:31 -07:00
Jonathan Williams
6f0309622c Removed AccountCache. 
Converted that to PlayerCache and store account id in there.
 2015-08-28 20:58:58 -07:00
Shaun Bennett
676817601a Prevent players from logging into the wrong clans server 2015-08-28 17:31:09 -07:00
Ty Sayers
35c79804ac Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-28 14:17:22 -07:00
Ty Sayers
825dd66283 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-28 14:17:11 -07:00
Shaun Bennett
c51a449df3 Enable caching for clans, update craftbukkit jar 2015-08-28 13:10:30 -07:00
Shaun Bennett
6f39c072a4 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-28 12:57:13 -07:00
Ty Sayers
b98cde8b80 Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed. 2015-08-28 12:52:02 -07:00
Shaun Bennett
cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -07:00
Ty Sayers
6a330a66d9 Fix bug with Building shop materials not properly being purchased in bulk. Modify the notification message for combat tagged players in safezones to display on the middle of the screen instead of chat. 2015-08-27 15:46:57 -07:00
Shaun Bennett
4f2d861b21 Fix chat bug, enable TablistFix for clans 2015-08-27 14:53:52 -07:00
Ty Sayers
783f526b76 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:42:41 -07:00
Ty Sayers
4dcd54a9b0 Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans. 2015-08-27 14:42:07 -07:00
Shaun Bennett
e86bca99fd Clans Chat 2015-08-27 14:33:50 -07:00
Shaun Bennett
b0ee2bb669 Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items 2015-08-27 13:57:57 -07:00
Shaun Bennett
adfc451e9f You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift 2015-08-27 09:33:44 -07:00
Shaun Bennett
a5400b0fef Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-26 18:35:20 -07:00
Ty Sayers
c20d2c9516 Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands. 2015-08-26 17:37:31 -07:00
Shaun Bennett
669de4c91d Change EntitySpawnEvent to CreatureSpawnEvent 2015-08-26 16:44:39 -07:00
Shaun Bennett
e4c48e5f3f Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 2015-08-26 15:01:44 -07:00
Shaun Bennett
e85682d68f Use proper item names for recipes, don't allow repairing items more than two times 2015-08-26 14:56:28 -07:00
Ty Sayers
62ffdc1ef1 Left-over commit from last update to add new /region-reset command. 2015-08-26 14:54:33 -07:00
Ty Sayers
3b999d2660 Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields. 2015-08-26 14:54:15 -07:00
Shaun Bennett
0dd79419eb Update schematic files 2015-08-26 13:39:13 -07:00
Shaun Bennett
e6c4227a4f Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 2015-08-26 13:30:02 -07:00
Ty Sayers
fc5f57803e Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map. 2015-08-26 13:29:22 -07:00
Ty Sayers
c3013063de Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans. 2015-08-26 13:09:10 -07:00
Shaun Bennett
14f5cb4704 Allow breaking/placing blocks when in creative 2015-08-26 13:09:01 -07:00
Shaun Bennett
7a66a8dad9 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-26 12:26:35 -07:00
Shaun Bennett
b13c9fe227 Field updates, War updates, bug fixes 2015-08-26 12:26:27 -07:00
Ty Sayers
52911b9534 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-26 12:24:02 -07:00
Ty Sayers
9a45d1116a Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones. 2015-08-26 12:22:36 -07:00
Shaun Bennett
bf1f62057c Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-08-24 22:15:08 -05:00
Shaun Bennett
6841cbac69 Clans bug fixes + shop updates 2015-08-24 22:03:26 -05:00
Ty Sayers
69afefd66f Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java

Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
 2015-08-24 20:55:29 -04:00
Ty Sayers
a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
Ty Sayers
6c9a99fa1b Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning. 2015-08-22 15:06:05 -04:00
libraryaddict
39ede2064a Bosses game progress 2015-08-21 16:12:26 +12:00
libraryaddict
1e14d29999 Clans: Migrate bosses to combat core, fix map to rotate its cursor, finished golem? 2015-08-17 21:04:26 +12:00
Mini-Chiss
7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
libraryaddict
81f793d693 Iron Wizard: Commit progress 2015-08-14 20:49:17 +12:00
Shaun Bennett
2305e8bbaa Store Kills, Deaths, Murders, Wins, Losses in database 
Add Murder
 2015-07-29 01:48:49 -05:00
Ty Sayers
13f47ad903 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/items/CustomItem.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
 2015-07-24 13:59:01 -05:00
Ty Sayers
0b49d053fe Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events. 2015-07-20 15:57:57 -05:00
libraryaddict
cd55eba2be Clans: Fix map inventory moving 2015-07-21 07:37:08 +12:00
Jonathan Williams
0772f2e91e Fixes for GoldManager 2015-07-19 21:04:59 -07:00
Jonathan Williams
3b47b01aea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-07-19 20:18:08 -07:00
Jonathan Williams
73aea85876 GoldManager now uses stored procedure. 
Deductions automatically process gold queue and return if transaction succeeded.
 2015-07-19 19:32:46 -07:00
Jonathan Williams
3660b348cd Work on Gold. 2015-07-19 18:15:50 -07:00
Shaun Bennett
1ef6fe3ed6 Observer changes 2015-07-17 15:37:33 -05:00
libraryaddict
3dcf489ea6 Add 'clan' to the clans command 2015-07-17 17:12:44 +12:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
libraryaddict
c79117f86a Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 2015-07-17 00:30:54 +12:00
libraryaddict
aaee5f01ce Clans: Modifications to map stuff, fix food level depleting too fast 2015-07-17 00:30:34 +12:00
Jonathan Williams
9cf4ff005a Added some debug checks. 2015-07-16 01:26:38 -05:00
Shaun Bennett
6a598690b0 Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix 2015-07-15 21:43:35 -05:00
Shaun Bennett
7f98157890 More work/fixes 2015-07-14 20:38:30 -05:00
Shaun Bennett
ae71de30db Fixes and changes 2015-07-14 01:57:53 -05:00
Shaun Bennett
5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05:00
Shaun Bennett
231d4bd494 Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events 2015-07-13 20:23:51 -05:00
Shaun Bennett
dc1fe5fc2c Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager 2015-07-13 19:11:17 -05:00
libraryaddict
66bef4ac00 Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans 2015-07-13 21:21:17 +12:00
Shaun Bennett
a9e68ff777 Completed Energy 2015-07-08 21:39:31 -05:00
libraryaddict
27c7e7be03 Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 2015-07-04 09:07:29 +12:00
libraryaddict
fbf2935b19 Don't display dead players 2015-07-04 09:07:14 +12:00
Shaun Bennett
384d1814d7 Scoreboard teams display clan relationships 2015-07-03 15:12:46 -05:00
libraryaddict
c021c6cc19 Added missing but not forgotten MapCommand 2015-07-04 07:12:50 +12:00
libraryaddict
24294237ea Add /map command 2015-07-04 04:11:35 +12:00
libraryaddict
89a4541275 If inventory is empty, add clans map 2015-07-04 04:09:18 +12:00
libraryaddict
c75f22b5e0 Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-07-04 03:44:59 +12:00
libraryaddict
68f7bd533d Clans Map stuff 2015-07-03 14:23:37 +12:00
Shaun Bennett
9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00
Shaun Bennett
0fce46f504 Finished Undead Camp Event (Loot tables still need adjusting) 2015-06-30 15:28:50 -05:00
Shaun Bennett
0fdc4e0008 Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java
 2015-06-30 14:04:35 -05:00
Shaun Bennett
be974bfaac Work from laptop 2015-06-30 14:02:39 -05:00
Shaun Bennett
e0284e2eb0 Loot for World Events 2015-06-29 22:32:40 -05:00
Ty Sayers
d2f633f572 Fix attribute name positioning bug as well as duplicated attributes on randomly generated items. Fix misleading description of item attributes Conquering/Protection. Fix bug with unwanted entities spawning and targetting players in safe Spawn zones. Fix bug with WindBlade occasionally killing users via fall damage after a long flight even though close to the ground. Fix bug with MagneticBlade not properly pulling entities other than players. Fix bug with AlligatorsTooth not properly granting certain effects such as water breathing. 2015-06-29 16:38:51 -04:00
Shaun Bennett
d07c319581 Saving some work 2015-06-27 22:22:02 -05:00
Shaun Bennett
1865e41144 Undead Camp 2015-06-26 01:05:36 -05:00
Shaun Bennett
7f530f6593 New border dimensions 2015-06-24 23:18:18 -05:00
Shaun Bennett
a0d97d5d99 Scoreboard changes, Fix region values, add 1.8 Border for map 2015-06-24 22:44:41 -05:00
Shaun Bennett
2735c81205 Fix bug with leaving and joining clans: online player list wouldnt update 2015-06-23 23:00:07 -05:00
Shaun Bennett
fa612c9c86 Chat filter clan names, Fix scoreboard bug 2015-06-23 22:48:51 -05:00
Shaun Bennett
935aba9c16 Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes 2015-06-23 21:45:55 -05:00
Shaun Bennett
e34324b864 Disable auto event now while location and abilities are tweaked 2015-06-23 17:05:47 -05:00
Shaun Bennett
76a1f2b1f0 Reset timer when no players are online 2015-06-23 16:37:49 -05:00
Shaun Bennett
009f8a6764 Merge with twiggy 2015-06-23 16:36:21 -05:00
Shaun Bennett
50ddd23251 Event auto starting, Terrain Finder, Scoreboard Tweaks, Event idle, other random tweaks 2015-06-22 20:34:13 -05:00
Ty Sayers
1541dc329e Merge branch 'clans/test-server' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
 2015-06-22 16:24:31 -04:00
Ty Sayers
2ffe2badf2 Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans. 2015-06-22 16:20:20 -04:00
Jeremiah Bishop
03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Shaun Bennett
71da87a5ae Some cleanup 2015-06-17 21:36:47 -05:00
Shaun Bennett
b5f4574b1b Show region on scoreboard, moving on to event finishes 2015-06-17 20:37:45 -05:00
Shaun Bennett
dbdb2b3fc5 Scoreboards and WorldEvent work 2015-06-17 17:40:16 -05:00
Shaun Bennett
8245b6c466 Schematic generation over time, fixes to gold manager drops 2015-06-14 17:30:02 -05:00
Shaun Bennett
d24f01ba86 More event stuff! 2015-06-11 23:35:29 -05:00
Shaun Bennett
9cdf69b19d More work on events 2015-06-09 22:58:52 -05:00
Ty Sayers
4dd1cf43de Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop. 2015-06-09 15:46:38 -04:00
Shaun Bennett
d1a7d16810 Fixes GoldManager 2015-06-08 15:04:30 -05:00
Shaun Bennett
6a0584d419 Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
 2015-06-08 15:03:51 -05:00
Shaun Bennett
aa9aba92cd Commit for merge 2015-06-08 14:59:06 -05:00
Shaun Bennett
8c7faf27dd Store gold drop amounts in item metadata (might be worth switching to our own storage?) 2015-06-06 16:04:11 -05:00
Shaun Bennett
24a1016836 Slime enrage 2015-06-06 15:39:51 -05:00
Shaun Bennett
6ea000fd22 Remove slimes when server stops 2015-06-06 15:16:03 -05:00
Shaun Bennett
1f92564ea1 Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED] 2015-06-06 14:49:41 -05:00
Ty Sayers
971612a538 Fix bug relating to Energy Shop purchases and item functionality. Fix bug with GoldManager not being properly initialized on plugin start-up. Add Shops safe-zone to region claims for default clans across world. Create BankShop for all interactions related to economy management, specifically buying & selling GoldTokens as well as converting Gems into Gold on a daily basis. 2015-06-05 19:18:06 -04:00
Shaun Bennett
90a7362440 Marge with twiggys code, work on slime splitting 2015-06-04 00:21:09 -05:00
Ty Sayers
fa3e6c3d1f Fix bug with multiple locations being used for claiming separate areas for server-side clans such as Spawn. 2015-06-03 20:10:32 -04:00
Ty Sayers
e15a2ad123 Add ClansRegions to handle the initialization of default server-side Clans representing special territories such as Spawn and Fields. Additionally, claim land with appropriate distribution according to the respective Clan. Fix bug with WeightSet generation not properly handling low amounts of uniformly likely elements. Fix bug with ClanInfo not properly handling creation of clans and initializing the date created field. Fix bug with Spawn region not properly protecting from claim and PvP settings. 2015-06-03 20:08:34 -04:00
Shaun Bennett
d8acb0aae6 Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-06-02 20:45:53 -05:00
Shaun Bennett
5d431a586a King of the hill work 2015-06-02 20:44:14 -05:00
Ty Sayers
1fa919e954 Finish GoldToken integration for cashing in. Re-implement fixed hidden JSON lore encoding. Fix damage reduction attributes where entity types weren't being properly initialized. Prevent players from breaking blocks in temporary Spawn regions. 2015-06-02 20:01:42 -04:00
Ty Sayers
155b078c49 Update spigot version to Shaun's changed. Add separate spawn locations at (200,0) and (-200,0) on the map as well as safe-zone regions surrounding spawns. Temporary halt energy deduction until energy shop is enabled. Fixed issues related to field zones being claimable/breakable, as well as borderlands. Define claimable areas. Add GoldToken item for storing currency into physical items. Add gold management for checking economic status for players. 2015-06-01 15:51:22 -04:00
Ty Sayers
2e19aabfa1 Convert damage system to custom Mineplex damage events to enable legendary abilities. Fix NPE and hanging issue on ServerData's serialization adapter. Finalize item generation logic for instantiating CustomItem's based on specified random distribution of types, attribute counts, etc. Fix several Legendary bugs discovered during testing. Clean left-over template documentation and further clarify ambiguous methods. Add proper updating logic for custom items to track internal stats in hidden json lore. Add safe-logout system to prevent combat logging and enable players to safely log after a designated amount of time. Tweak WindBlade's flight speed to a more natural value. 2015-06-01 12:25:20 -04:00
Shaun Bennett
68b708e32e Schematic Utilities for Clans 2015-05-29 18:23:46 -05:00
Shaun Bennett
dc994956e1 [Clans] Slime absorb work 2015-05-28 18:56:03 -05:00
Shaun Bennett
6b10d9f3c9 [Clans] More work on world events 2015-05-28 15:20:43 -05:00
Ty Sayers
167549c9e8 Add implementation for variety of attribute and base attribute hierarchies, add in JSON encoding for itemstack-item pairing to hold stats and information about items without unintuitive print & parse methods. Temporarily disable donation related commands in DonationManager for testing, as it was presenting compilation issues. Introduce further implementation of LegendaryItems. Add various utility methods for JSON encoding (utilizes GSON). Fix various bugs seen in internal testing. 2015-05-25 14:22:06 -04:00
Shaun Bennett
20fadcd187 [Clans] Work on world events/slime boss 2015-05-24 01:37:16 -05:00
Shaun Bennett
ff377a3e5c [Clans] World event state system 2015-05-21 15:33:02 -05:00
Ty Sayers
a8a8d4961a Add remaining bow and armor based attributes, include base implementation of Legendary weapons. Fix smelting bug. 2015-05-16 12:58:58 -04:00
Mini-Chiss
643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Ty Sayers
6b3028605e Merge branch 'master' into clans_custom_gear 2015-05-05 15:58:03 -04:00
Ty Sayers
66c9fefc6e Add leftover Clans commit to introduce GearManager. 2015-05-05 15:34:32 -04:00
Ty Sayers
7567648312 Add CustomItem hierarchy for Clans project, introducing rare gear that can be decorated with various ItemAttributes for unique effects. 2015-05-05 15:33:42 -04:00
Shaun Bennett
244ffece8a Fixes for build game + fix clans compile 2015-05-01 18:02:06 -05:00
Shaun Bennett
4ac4e9d729 Start of world event framework 2015-04-30 13:15:20 -05:00
Shaun Bennett
50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
Jonathan Williams
98b14c9c7e Fixed Clans repository so it uses the pool. 2015-03-11 19:20:42 -07:00
Jonathan Williams
626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."" 
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
 2015-03-11 18:05:13 -07:00
Ty Sayers
215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections." 
This reverts commit adfe5fb74e.
 2015-03-07 19:38:06 -05:00
Ty Sayers
adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Jonathan Williams
5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
Shaun Bennett
90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
CoderTim
6a368454ec Clans database refactoring 2015-02-18 21:31:38 -05:00
CoderTim
aebe390c3c Refactored ClanRole enum 2015-02-18 19:56:29 -05:00
Jonathan Williams
fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Shaun Bennett
58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Shaun Bennett
f8885e4c5c Merge remote-tracking branch 'origin/master' 2015-02-05 21:36:19 -05:00
Shaun Bennett
d878e3940e War state, handle time better, ability to have a server timezone (see ClanManager) 2015-02-05 21:36:07 -05:00
Chiss
dbd6f449eb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
 2015-02-05 11:37:35 +11:00
Chiss
c7d4b14f4c Revert "Revert "Work on treasure............"" 
This reverts commit 49bfe385bf.
 2015-02-05 11:34:29 +11:00
Shaun Bennett
0f23533f41 Fix typos in EnemyData 2015-02-03 23:18:42 -05:00
Shaun Bennett
2060b74343 War death handling, more war logic, other fixes 2015-02-03 19:35:53 -05:00
Shaun Bennett
b0be5b2510 Time code for war, server time command 2015-02-03 16:48:26 -05:00
Shaun Bennett
3b324448b5 Fix errors in war manager 2015-02-03 14:19:22 -05:00
Shaun Bennett
939c6189a7 Merge energy and war with master 2015-02-03 14:16:07 -05:00
Shaun Bennett
bb197ff629 Merge War and Energy 2015-02-03 14:14:52 -05:00
Shaun Bennett
6cefeb1b74 More work on War 2015-02-03 14:02:45 -05:00
Jonathan Williams
49bfe385bf Revert "Work on treasure............" 
This reverts commit 50a8fb03a9.

REVERT ALL SHAUNS CRAP.
 2015-01-29 22:28:41 -08:00
Shaun Bennett
1cc0879ce9 treasure stuff 2015-01-29 22:17:46 -05:00
Jonathan Williams
b92226a771 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 00:55:36 -08:00
Jonathan Williams
08078c1622 Removed Logger 2015-01-22 23:18:38 -08:00
Shaun Bennett
8bf64ec55c Database and code implementation of enemies 2015-01-22 22:17:19 -05:00
Shaun Bennett
882eb46479 Unclaiming land when you run out of energy 2015-01-22 21:32:10 -05:00
Shaun Bennett
2bab4133b0 Fix ugly /gold command 2015-01-22 20:41:05 -05:00
Shaun Bennett
a1f2a3a2a1 Clan Energy 2015-01-22 20:34:44 -05:00
Jonathan Williams
8e04a2a5f2 Portal now checks server status and player's rank before sending them to a server to prevent login spam. 
Refactored portal method names.
 2015-01-11 00:42:31 -08:00
Jonathan Williams
f0e3520343 Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin 2014-12-29 08:02:14 -05:00
Jonathan Williams
97f57b655b Prevent horses from spawning in Clans 
Added Building supplies shop and pvp shop to clans.
 2014-12-29 06:44:00 -05:00
Jonathan Williams
9b3350c8c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-22 09:22:50 -05:00
Jonathan Williams
d920439ec5 Clans update. Laying groundwork for energy 2014-12-22 09:22:10 -05:00
Chiss
679f7909b0 Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers 2014-12-18 12:45:56 +11:00
Shaun Bennett
d19431a47f Rename Clicked to onClick 2014-12-17 18:40:44 -06:00
Shaun Bennett
1260e875fd Add clans to intellij. Update button 2014-12-17 18:38:35 -06:00
Jonathan Williams
6941c1c827 Added a few more items for BuildingShop in Clans. 2014-12-15 21:29:50 -05:00
Jonathan Williams
5b67e2182a Added disguise to Pet Manager for eventual wither disguised pet. 2014-12-14 02:30:39 -05:00
Jonathan Williams
342c44affc Fixed a bunch of clans bugs 2014-12-08 00:55:20 -08:00
Jonathan Williams
60a46d5adf Replaced Dwarf Toss with Block Toss in Clans. 2014-12-06 04:23:26 -08:00
Jonathan Williams
3d3f9012ff Added some base Clans shops. 
Added support for Gold

Refactored failed db call code a bit.
 2014-12-04 23:41:49 -08:00
Jonathan Williams
59f93d46ec Refactored IButton 
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
 2014-12-04 05:05:27 -08:00
Jonathan Williams
abaf9f4693 Refactored IRelation method names 
Added support for negative amounts in Support server.

Clans in core testing state.
 2014-12-03 13:06:50 -08:00
Jonathan Williams
e7cf4eb51d Removed use of Gem Boosters 
Cleaned up some unused imports.
 2014-12-01 02:27:39 -08:00
Jonathan Williams
f507db7664 Reworked spawn to save to database. 
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
 2014-11-29 03:16:37 -08:00
Jonathan Williams
92ea94c3be Fixed creating clan delay in clans/ClientClan.java 
Added logging for Mineplexer startup.
Fixed return generated keys in RepoBase
 2014-11-28 14:06:41 -08:00
Jonathan Williams
515176b63f Clans to buildable state. 2014-11-27 22:34:20 -08:00
Jonathan Williams
1198426d8d Little more work on Clans. 2014-11-23 05:08:33 -08:00
Jonathan Williams
1a6b80b08e More work on clans.. 
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
 2014-11-19 22:24:36 -08:00
Jonathan Williams
df76f6be10 More work on Clans. 2014-11-15 01:13:14 -08:00
Jonathan Williams
4812da2cd9 More work on Clans - Clan repository. 2014-11-13 19:14:56 -08:00
Jonathan Williams
1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
Jonathan Williams
8d62966abc Created Clans project. 
Converted Fields code complete (not tested).
 2014-11-12 05:13:16 -08:00