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

5923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fooify
4198e73120 Fixed SG Barbarian bug 2015-11-17 16:05:49 -08: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
William Burns
e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
Mysticate
1342a8ac9f Class 2015-11-17 11:38:15 -05:00
Mysticate
448dd33c1a Switching branches c: 2015-11-17 11:38:02 -05:00
William Burns
0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +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
Cheese
adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
Shaun Bennett
007d5a00dc Merge remote-tracking branch 'origin/master' 2015-11-16 16:39:43 -05:00
Shaun Bennett
e35eec4cb1 Update motdmanager and compiler.xml 2015-11-16 16:39:34 -05:00
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13: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
Jonathan Williams
88dbe261db Added logging for stacker. 2015-11-15 18:34:35 -06:00
Jonathan Williams
ac792dcd02 Removed some unnecessary code in updateRank and opened up all ranks to be used. 2015-11-15 18:33:43 -06:00
AlexTheCoder
217509b75a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
 2015-11-15 18:58:20 -05:00
libraryaddict
e5b376bc5c Fixed wrong CB 2015-11-16 12:48:26 +13:00
AlexTheCoder
667edc8a90 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-15 17:48:16 -05:00
AlexTheCoder
ecaa4a49b4 - Fix for stats 2015-11-15 17:48:00 -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