Virizion
975b1df477
Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear.
2015-11-18 22:03:04 -05:00
Virizion
796f116cfd
Merge branch 'master' into virizion_speed_builder
2015-11-18 19:27:42 -05:00
Virizion
937d024ea5
Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason...
2015-11-18 19:26:19 -05: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
Sarah
d7d11e57e5
Merge pull request #76 in MIN/mineplex from william-global to master
...
* commit '4620a5a1626aaefb992ff62a14dc35ed9ae60a86':
Hub fix
testing excludes
2015-11-18 15:49:18 -06:00
William Burns
4620a5a162
Hub fix
2015-11-18 21:47:52 +00:00
Virizion
76db2710ae
It should have been all got the build 100% correct not all got the same score.
2015-11-18 16:10:44 -05: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
William Burns
6fa2a58f5d
Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global
2015-11-18 18:50:09 +00:00
William Burns
0e1c72e25d
testing excludes
2015-11-18 18:46:51 +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
Shaun Bennett
1eff698a34
Merge pull request #75 in MIN/mineplex from william-global to master
...
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
ranks
woops easy fix
rawr and fixes
Added the ability to give out game loot.
Reformatting titles
Added GlobalGiveCoins. Changes Gems a little and the manager.
More global stuff! Added GlobalGiveGems.
Global Packet work. Added giveitem sub-command.
2015-11-18 10:15:33 -06:00
William Burns
a11ca138e7
ranks
2015-11-18 16:01:53 +00:00
William Burns
04a4b072af
woops easy fix
2015-11-18 15:48:25 +00:00
William Burns
2e223d0660
rawr and fixes
2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a
Added the ability to give out game loot.
2015-11-18 14:35:40 +00:00
William Burns
e83b49d490
Reformatting titles
2015-11-18 13:43:22 +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
Virizion
8145b127ba
Changed the score algorithm so if all players have the same score, nobody is eliminated.
2015-11-17 20:04:23 -05: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
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
