e36b0440a4
Merge branch 'bench'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
a36af0acc4
Remove space :) I assume this isn't intended
2015-06-24 10:28:39 -07:00
5280433dbd
Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 10:03:53 -04:00
478a3c8591
some champs fixes/balance
...
duplicate message improvement
2015-06-20 15:00:16 +10:00
2c43dc76c9
DMT no longer effected by 3s chat delay
...
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
2015-06-20 11:12:24 +10:00
750dddeabc
Editing .classpath and a main testing method in UtilBlock
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-19 21:10:10 -04:00
13ae7a19db
jr.dev rank up
2015-06-19 18:06:40 +10:00
47744a80e9
jnr dev
2015-06-17 10:44:29 +10:00
3014521e79
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-17 10:43:01 +10:00
c8843aa2b2
jnr dev rank
2015-06-17 10:42:20 +10:00
0d12a2c12d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-16 12:43:04 -05:00
b0c026e67c
Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn
2015-06-16 14:01:52 +12:00
88328148d1
Modified hardcoded IPs for Bungee player counts.
...
Added Jr Dev rank.
2015-06-15 12:52:59 -05:00
8cf10afb1b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-06-06 18:31:08 +12:00
ef9c69f356
UtilShapes: Fix a method, add a space in OldMineWare in GameType
2015-06-06 18:08:37 +12:00
f9b49caeed
More gems for bridges/sg kills
...
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
2015-06-05 12:21:20 +10:00
678c2c514a
Oops!
2015-05-12 18:45:01 -05:00
f9269b534f
[Core] Add look AI to NPC's
2015-05-12 18:43:26 -05:00
4cae02f2d8
set LT as higher than Owner for perms.
2015-05-11 21:31:37 -05:00
e0e79d79a5
LT rank
2015-05-11 21:28:25 -05:00
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
5e73441b9a
UHC world loading
2015-05-11 14:10:51 -05:00
123af16bd2
UHC map gen
2015-05-11 13:25:05 -05:00
a435ed5bae
More build changes
2015-05-03 19:10:13 -05:00
f98ac0874c
Merge remote-tracking branch 'origin/master'
2015-05-03 18:22:14 -05:00
fbfb5e637e
Mob Gui + Ground Change Gui + UtilSkull for special mob skulls
2015-05-03 18:18:16 -05:00
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
40c838b030
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 14:50:56 -05:00
8224450b44
Build Update
2015-05-03 14:50:50 -05:00
17cbcc3771
Craftbukkit changes for UtilParticle update, and UtilParticle fix
2015-05-03 14:42:31 -05:00
ff6da92fb7
Some Build world, support for far rendered particles
2015-05-03 14:41:09 -05:00
6ad09f0ade
Master Builder update
2015-05-02 22:05:12 -05:00
ab6937a525
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 18:05:55 -05:00
244ffece8a
Fixes for build game + fix clans compile
2015-05-01 18:02:06 -05:00
ba5802cc14
wizards kit availability
2015-05-01 00:47:51 -05:00
aeff6bf4b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-22 00:25:56 +12:00
8803941bd8
Wizards: More changes as per demand.
2015-04-16 05:51:08 +12:00
482ee6eb79
changed builder rank name
2015-04-14 09:35:35 +10:00
be21968805
UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion
2015-04-12 23:20:52 +12:00
afa372dca7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
2015-04-11 12:20:29 +12:00
43163cd7d7
UtilParticle: Added lore for future reference on colored particles.
2015-04-11 12:14:12 +12:00
28d0e28607
UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals
2015-04-11 12:13:37 +12:00
85c9f9010e
Added Twitch Rank
...
fixes hitbox on glacial
2015-04-10 13:11:02 +10:00
d5137d9ec6
UtilParticle: Added option to send own particle strings, added two particles
2015-04-03 19:35:57 +13:00
05319511ff
UtilBlock: Modified getInRadius() to allow option of a hollow sphere
2015-04-03 19:34:24 +13:00
f682bb8f9c
fixed kit items not spawning
...
horse pet doesnt spawn when dead
2015-04-03 12:10:02 +11:00
a27e6fba5c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-27 06:00:14 +13:00
4a25265c7c
Added utility methods to check for players within a sight pyramid
2015-03-25 17:13:22 +11:00
510b6bcf80
Add optional checks to UtilInv.contains and UtilInv.getItems for cursor and armor items.
2015-03-23 13:13:16 +13:00
c48dad8eeb
UtilInv.contains() no longer loops through inventory contents, but uses getItems(player) which gets armor, inventory and cursor itemstack.
2015-03-23 13:06:19 +13:00
1f0e204eb3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
44e887ec61
fixed give command to properly assign item data
2015-03-17 12:06:41 +11:00
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
bead4a7626
No longer need to constantly set the durability of items in the sheep game
2015-03-15 13:13:06 +13:00
18094fea9b
Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...)
2015-03-15 12:32:59 +13:00
503106892d
Fixed UtilTime for displaying decimals when trimmed
2015-03-15 12:32:42 +13:00
e1c284722e
Add method getEntityById to UtilEnt
2015-03-15 12:28:17 +13:00
3ceb0ff678
Converted spec away from CREATIVE
2015-03-12 15:31:40 +11:00
8e77d1fc21
more event server updates
2015-03-12 12:14:49 +11:00
17543910b5
Added Chest packages to support server.
...
Fixed Punish not loading.
2015-02-14 15:09:42 -08:00
26463ba75d
Treasure changes :O
2015-02-09 20:24:20 +13:00
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
79cde8f5cf
fixed util textbottom for 1.8.2
2015-02-05 21:39:42 +11:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
73866669b8
Added RestartCommand and SuicideCommand
...
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.
Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
fa47f33407
*cough* fixes to UtilTime *cough*
2015-01-23 02:31:00 +13:00
94607585a3
Fixed UtilTime being bugged
2015-01-21 19:00:39 +13:00
dd2418232c
Wizards progress
2015-01-21 19:00:07 +13:00
52d83587cd
Fix dragon bossbar not being halved
2015-01-18 21:23:50 +13:00
ea452d8fa5
Wizards progress
2015-01-18 21:23:48 +13:00
a42cfed226
Add a comment on what each of the block hashsets do in UtilBlock to make it easier to use without struggling to remember
2015-01-18 21:23:46 +13:00
0ad4034f96
The beginnings of a api to calculate shapes; mainly for particle use
2015-01-18 21:23:46 +13:00
d6b5439eb5
Initilize the static byte HashSet's in UtilBlock not when you try to compare a block, but on class load
2015-01-18 21:23:45 +13:00
b40393af10
Modify UtilPlayer to get the entity someone is looking at
2015-01-18 21:23:45 +13:00
34ce818614
Stupid else ifs
2015-01-18 21:23:03 +13:00
a64e082f2c
Only add a 's' to UtilTime's convertString if the number in the string is not a 1
2015-01-18 21:23:03 +13:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
7402eb2f91
Merge remote-tracking branch 'origin/master'
2014-12-06 01:00:40 -06:00
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
03bd2ed2c1
Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text
2014-12-04 17:48:06 -06:00
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
0813f0a914
Instead of having a internal entityId. Use mojang's entityid's but add one everytime you want it. Also allow fetching of the next entityid to be used
2014-11-30 15:41:57 +13:00
4b2998793c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-28 14:16:07 -08:00
b3beadf8b5
made recharge look nicer for 1.7
...
added missing files
2014-11-29 09:14:33 +11:00
515176b63f
Clans to buildable state.
2014-11-27 22:34:20 -08:00
Cheese
fooify
Aaron Brock
Jonathan Williams
libraryaddict
Shaun Bennett
Mini-Chiss
Shaun Bennett