03537e4650
fixed a spacing issue
2015-09-04 12:18:02 +10:00
0ec3a8dc10
added radar for ctf and dom
2015-09-04 12:09:26 +10:00
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
63107b0c26
missing file
2015-08-20 20:39:20 +02:00
15c873392a
updated give to allow naming of items.
2015-08-20 20:38:07 +02:00
633cbdabe2
player.isOnGround() is controlled by packets from the player, meaning
...
players can easily fake being on the ground resulting in infinite double
jumps. player.getFallDisance() is also reset when isOnGround() returns
true, meaning we'll need to manually check if the player is on the
ground.
Outlines two opposite corners of the entities bounding box, scann all
blocks inside, check if any of them are solid and return respectively.
2015-08-20 15:42:39 +02:00
859a7e07d5
added the optional functionality
...
to include air blocks in the util
method getInBoundingBox()
2015-08-18 16:46:20 -07:00
2659dd4e39
Fixed minor bugs. Head now follows mob altitude.
2015-08-14 23:17:56 -04:00
7fb85f24d1
UtilEnt: Change CreatureLook to support LivingEntity, not just Creature
2015-08-14 19:15:35 +12:00
33a6e4cb13
UtilEnt: Add CreatureLook method
2015-08-14 19:12:05 +12:00
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
e81a3f7ecd
Added a method to UtilAlg.
2015-08-10 14:32:49 -04:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
abf12dbbfa
Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-06 08:44:36 +02:00
6a3d888f5b
fix git
2015-08-06 08:44:16 +02:00
ea0c6075f2
rank sifx
2015-08-05 20:25:23 +02:00
e86e7b624e
remnvoed special case for me
2015-08-05 10:28:05 +02:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
8ea967b37e
fixed possible NPE
2015-08-02 12:35:25 +02:00
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
da94c30c02
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 18:06:00 -04:00
832fb4638a
More things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:42:00 -04:00
16bad71dcc
1.8 Updates
2015-07-27 20:26:37 -05:00
da3500cc32
Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
# Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
# Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
# Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
# Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
# Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
# Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
# Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
2015-07-27 19:39:18 -05:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
dffde68982
fixed bug
...
removed debug
2015-07-25 17:11:02 +02:00
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
6ed3f93df7
fixed some scoreboard stuff
2015-07-17 16:17:01 +10:00
44102842c9
added some velocity debug
2015-07-17 13:27:55 +10:00
63f6adf295
fixed spawn picking
2015-07-17 12:50:34 +10:00
49daf597b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-09 12:47:57 +10:00
5babd8a41a
Fix number formatting for different system locale
2015-07-09 03:45:57 +02:00
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
ed0db983f8
More work on 1.8 update
2015-04-23 08:28:19 -04:00
cf4353bedf
Delete some classpath dummy changes, jsonmessage fixed
2015-04-22 16:37:45 -04:00
f4b6d4e44e
Starting on converting to 1.8
2015-04-22 16:06:38 -04: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
Cheese
Mysticate
Jonathan Williams
Mini-Chiss
xGamingDudex
fooify
libraryaddict
Shaun Bennett
Sarah
Aaron Brock
Ben Sihota
Shaun Bennett