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

4996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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