e887bbf543
Pooling with later jedis versions doesn't work on Bungee.
2016-02-01 18:13:50 +11:00
cc1ecbe0b8
Add Eclipse magic.
2016-02-01 10:24:49 +11:00
45aacd626e
this isn't used anymore
2016-01-31 19:20:15 +00:00
cc857da88e
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
a5439943d6
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-31 15:47:52 +00:00
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
852f96a314
Speed up LobbyBalancer to 500ms
2016-01-31 09:45:34 +11:00
478b92db44
Add example maven settings.xml
2016-01-31 09:44:46 +11:00
b9354b7972
Remove setTestOnBorrow
2016-01-30 16:10:30 -05:00
9c83c64d01
Fixed issues with Broadsword
...
Added max building height of 100
2016-01-30 21:34:06 +11:00
4612550ba5
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-01-30 19:24:42 +11:00
aa0cfc7710
Fixes to TnTGeneration
...
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
52b6779a4f
Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
Fixed explosions dropping right items.
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06:00
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
1f2fc65f99
Tone down lobby balancer too.
2016-01-30 13:55:58 +11:00
7ed0ab442f
Emergency patch to slow down redis player count updates.
2016-01-30 12:36:20 +11:00
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
fe01c9b8d5
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-29 20:57:10 +00:00
d10266c4d1
sapling fix
2016-01-29 20:56:38 +00:00
7d28bc69c9
collision boxes on siege weapons and other stuff
2016-01-29 20:55:56 +00:00
76dba421b4
sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]
2016-01-29 20:54:31 +00:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
d30fb8d8ef
Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-29 03:40:28 -05:00
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
2e2a08bea8
Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop
...
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
Prevented Coal particles from showing during the game
2016-01-29 02:33:57 -06:00
ba0dd3da44
Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
Added proper ore pickup delay.
2016-01-29 02:33:23 -06:00
a0e9a82327
Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
...
* commit '7d33e76055eb160e58d63443a72117e654df9468':
Fixed ForTheKing achievement.
Made sure Sniper achievement in Bridges is always fulfilled.
Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
63fa942789
Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
...
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
dc469b9562
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2016-01-29 17:02:07 +13:00
8aac172c4a
Update CB.jar
2016-01-29 17:01:48 +13:00
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
d1d3382ec0
Prevented Coal particles from showing during the game
2016-01-28 22:44:33 -05:00
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -05:00
60ee5d1da0
Move disable custom inside of IsActive check
2016-01-28 22:33:48 -05:00
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
40f6969413
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
251fb53f29
Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
...
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
bf273708f9
Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
...
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
the L
Updateting spectator Menu layout.
fixing spec item in menu
Removing right clicking.
removing switching players until spigot patch is on.
adding spectator rotation.
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
015cca57b6
Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
...
* commit '75629055d851265e91eb7d0679a40a1357552e17':
Un-register HotbarEditor MiniPlugin and fix /spec bug.
Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
f72ee95759
Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
...
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
Remove debug message.
Fix flickering judge laser.
Borders for spec are fixed.
Leaves fix.
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
Make dependable require 50 perfect builds instead of 10.
Multiply by less
negative!
Trying different hologram location
Fix messages, fix /stats
Center hologram
Make achievement category classics
hologram changes
Holograms maybe?
Chiss' checklist.
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
Fixed builds with only mobs not loading.
Fixed mobs.
TICK TICK TICK TICK.
all players equal, no one loses
...
2016-01-28 21:02:23 -06:00
7860ca24c8
disallow all staff from using /we
2016-01-28 23:33:06 +00:00
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +00:00
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
37fb656279
dispenser
2016-01-28 13:31:45 +00:00
f645c4d6f8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-28 13:30:50 +00:00
88c1391ba2
disallow sapling in dispensers (grrr working in two different branches is really strange)
2016-01-28 13:30:16 +00:00
8cb5591218
merge conflicts
2016-01-28 13:28:39 +00:00
a0cc0b7ec9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
2016-01-28 13:28:00 +00:00
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +00:00
ceeeb3bc45
no tnt from dispensers
2016-01-28 10:58:46 +00:00
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
682a243c31
fixed catapult state being mapped to incorrect blocks
2016-01-28 09:18:58 +00:00
70be135a40
Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
3d4cd9ee27
Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager
2016-01-26 17:47:01 -06:00
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
7f7e73a101
more catapults!
2016-01-26 21:10:58 +00:00
3d7a371d1d
catapults
2016-01-26 20:18:53 +00:00
155d8bff1b
Fix cannon angles
2016-01-26 13:36:30 -06:00
9215d0d3ff
NegativeArraySizeException fix
2016-01-26 18:40:55 +00:00
63f9622876
cannon correctly loadded title + fixed rotation being all wrong
2016-01-26 17:51:29 +00:00
7c85fe62ca
charred blocks updates
2016-01-26 17:36:12 +00:00
2445e73623
better cannon crater particles
2016-01-26 13:06:47 +00:00
3b18b93286
fixed top right slot in cannon not counting as an empty slot.
2016-01-26 09:26:51 +00:00
467af4b835
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-26 09:24:53 +00:00
2f4146c243
Leaves fix.
2016-01-25 21:12:28 -05:00
c5dfddd710
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
2016-01-25 20:54:01 -05:00
a1eec79b3b
Make dependable require 50 perfect builds instead of 10.
2016-01-25 16:43:43 -05:00
e68dea65e1
stop dispensers being used for flint-andsteal, bonemeal etc etc
2016-01-25 17:46:39 +00:00
18e892c4ec
finally fixed that windblade dupe
2016-01-25 17:41:07 +00:00
71bb1ed3d6
this is just really slowing down startup time by A LOT
2016-01-25 17:22:56 +00:00
9d77632fcc
allow clans moderators to use /cb
2016-01-25 17:18:00 +00:00
2bf2050844
increased sapling cooldown to 20 minutes from one second.
2016-01-25 17:13:53 +00:00
7f1c74ced5
bumped version up to 0.19
2016-01-25 17:11:08 +00:00
2b70daf8df
allowed clans mods to use /cban
2016-01-25 17:02:49 +00:00
5a5dc9925e
set spawning rate of charred blocks a 10% lower
2016-01-25 17:02:26 +00:00
208df93739
fixed fire particles not showing up in craters
2016-01-25 17:02:02 +00:00
ce36cf79bf
added a tnt limit, set to 1 as it makes gameplay better
2016-01-25 17:01:46 +00:00
9b88683fdc
fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.
2016-01-25 17:00:38 +00:00
53132a248f
the L
2016-01-25 12:28:21 +01:00
c7733bb068
Updateting spectator Menu layout.
2016-01-25 12:27:19 +01:00
91b6ae8b09
fixing spec item in menu
2016-01-25 12:14:56 +01:00
4314f35f80
Multiply by less
2016-01-25 04:46:47 -06:00
b143ec7c19
negative!
2016-01-25 04:42:09 -06:00
6ff7c83d3e
Trying different hologram location
2016-01-25 04:17:58 -06:00
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
d511ca5bad
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-25 03:51:44 -06:00
bc8f6e511c
Center hologram
2016-01-25 03:44:22 -06:00
2dcc356aab
Make achievement category classics
2016-01-25 04:33:25 -05:00
61f1a58b1c
hologram changes
2016-01-25 03:29:53 -06:00
181cce4774
Holograms maybe?
2016-01-25 03:08:56 -06:00
33845cbc72
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:48:13 +00:00
fde5a5af28
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:47:08 +00:00
5b32911a42
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-25 08:46:26 +00:00
0b7cec60ae
put cmod above support so that support can't bypass clans home block
2016-01-25 08:44:17 +00:00
d82a7b353f
allow C.Mods to join all server regardless of home servers
2016-01-25 08:42:38 +00:00
54fa1449f6
cannon crater changes
2016-01-25 08:40:59 +00:00
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
31ef7ffe19
Removing right clicking.
2016-01-25 07:45:38 +01:00
f722831e6a
removing switching players until spigot patch is on.
2016-01-25 05:44:06 +01:00
9e63c9000a
adding spectator rotation.
2016-01-25 04:30:42 +01:00
bfe9aa7a59
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
2016-01-24 21:55:57 -05:00
0eda813d41
Fixed builds with only mobs not loading.
2016-01-24 19:14:34 -05:00
c43c09fd3c
the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon
2016-01-24 21:45:46 +00:00
0252436990
cannons updates
2016-01-24 20:56:47 +00:00
00f01e09af
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-24 20:00:05 +01:00
a41521d6a9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java
2016-01-23 13:42:25 +00:00
1f7e1fb6cf
fix dupe bug and safelog
2016-01-23 13:40:49 +00:00
24011c4af4
cannons work
2016-01-23 12:46:52 +00:00
a747426fa0
Fixed mobs.
2016-01-23 05:00:14 -05:00
a359c4f8b6
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-23 03:42:50 -05:00
1e732b08e7
TICK TICK TICK TICK.
2016-01-23 03:42:36 -05:00
790e2e8f73
Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder
2016-01-23 19:32:37 +11:00
c1ff7f4fc2
all players equal, no one loses
2016-01-23 19:32:23 +11:00
a75770b0a6
Change build to load from top instead of bottom.
2016-01-23 03:15:41 -05:00
650d586e0f
Add perfect build count to stats
2016-01-23 02:49:08 -05:00
f82a408f30
Build time modifiers
2016-01-23 02:43:41 -05:00
5dc773032b
Add joining players to guardians team instead of spectator.
2016-01-23 02:10:11 -05:00
245cc1ed93
Limit Perfectionist achievement to 1.
2016-01-22 22:18:29 -05:00
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
b2e4dff9e5
Add time to perfect build message
2016-01-22 19:18:23 -05:00
02b45bd302
Forgot to register stat tracker
2016-01-22 19:14:25 -05:00
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
d0e5be9c93
Guardian is impressed (untested!)
2016-01-22 18:35:18 -05:00
bf6f1a1701
sapling stuff messed up oops
2016-01-22 15:28:12 +00:00
090b6e496a
sapling stuff messed up oops
2016-01-22 15:27:44 +00:00
c524247777
supplies command for sieges
2016-01-22 15:27:10 +00:00
6638562866
npe fix
2016-01-22 15:21:20 +00:00
f25c7b0277
don't need that + npe fix
2016-01-22 15:19:32 +00:00
b869d4a7a8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-22 15:16:20 +00:00
c4bbeb2535
more control over saplings
2016-01-22 14:55:50 +00:00
a377a09925
fixed wind blade dupe bug
2016-01-22 11:22:20 +00:00
cc48d98208
pushing to beta to change to alpha
2016-01-22 11:06:19 +00:00
3f715ab4dd
Enable inventory click.
2016-01-22 02:23:58 -05:00
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
49e439af55
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-22 01:28:09 -05:00
6bb60ddebd
Ignore empty builds (untested!)
2016-01-22 01:27:29 -05:00
c66f37817e
Fixed invis bug.
2016-01-22 01:22:31 -05:00
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
0da921f3d2
Removed debug thing.
2016-01-21 23:52:59 -05:00
a38319147a
Stopped physics which fixed the torch bug.
2016-01-21 23:49:49 -05:00
582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05:00
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
5af8d747b3
Merge remote-tracking branch 'origin/develop' into develop
2016-01-20 15:07:48 -05:00
269cd710fc
Fix wrong group id for spigot excludes
2016-01-20 15:07:39 -05:00
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05:00
7715df8e6a
Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop
...
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-20 12:24:33 -06:00
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
c7bb380a56
Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop
...
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
Fix small memory leak in Mineplexer.
2016-01-20 12:23:13 -06:00
0a5791a92f
Go back to compile scope, need to talk to md_5 about this
2016-01-20 13:13:20 -05:00
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
8977735baf
Include a version.properties in maven build
2016-01-20 11:57:21 -05:00
8017da9413
Delete JedisTest
2016-01-20 10:25:31 -05:00
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
9884742552
Fix OrderedObjectives, Starting CombatTutorial work
2016-01-19 16:34:51 -05:00
80d55b2c9c
It works!
2016-01-19 13:34:17 -05:00
0f83263871
Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-01-19 11:01:11 -05:00
947ce254da
Tutorial Gui, Fixes
2016-01-19 10:59:56 -05:00
7af8d78fc3
Add resource pack and other fixes
2016-01-19 14:00:23 +00:00
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00
b22f452b1f
Gladiators, added stats
2016-01-18 11:36:16 +00:00
297e9baf41
Evolution, added stats
2016-01-18 11:34:43 +00:00
f3d27c9d93
Draw my thing, added stats
2016-01-18 11:32:40 +00:00
3d88f5aaae
Dragons, added stats
2016-01-18 11:11:32 +00:00
ba50b5fdb1
Dragon Riders, added default registery
2016-01-18 11:09:19 +00:00
c3d9be2123
Dragon Escape Teams, added stats
2016-01-18 11:05:09 +00:00
85f4ee50f0
Dragon Escape, added stats + implemented kit display for stats
2016-01-18 11:04:12 +00:00
66f484760e
Death Tag, added stats
2016-01-18 10:53:56 +00:00
96d16932dd
Christmas Chaos, added stats
2016-01-18 10:50:04 +00:00
dc44207d7a
Champ TDM, added stats
2016-01-18 10:48:10 +00:00
4e09aa4c34
Champ Dominate,added stats
2016-01-18 10:45:48 +00:00
f79acaaa2a
Champ CTF,added stats
2016-01-18 10:43:46 +00:00
508c4e99d2
Castle Siege,added stats
2016-01-18 10:41:10 +00:00
b0eb5a6d4e
Cards Against Humanity, skipped/left blank
2016-01-18 10:34:43 +00:00
56b3e482f2
Master Builders, added stats
2016-01-18 10:32:38 +00:00
044d2bac83
Fix some Invisibility preference bugs
2016-01-17 22:55:04 -05:00
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
976779b9f2
Tutorial Work
2016-01-17 22:45:38 -05:00
5ed9295944
updating Hub command as well
2016-01-17 18:10:16 +01:00
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
55c54eeff4
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-17 20:11:25 +11:00
52bda30f85
Mysts OCD again......
2016-01-17 03:03:00 +01:00
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
6cf08193df
Fix small memory leak in Mineplexer.
...
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
2016-01-16 20:36:49 +11:00
40c52ac557
made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost
2016-01-16 08:25:30 +00:00
254a2e45e4
comments + cannons state enum rename
2016-01-16 08:22:35 +00:00
e71a2d2e48
quick npe fix
2016-01-16 08:20:11 +00:00
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
f22297418c
Clear full canvas at start fix
2016-01-15 19:08:25 +00:00
733bfadf68
Added spray can tool
2016-01-15 18:52:26 +00:00
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
c16a719be1
Bridges, added stats
2016-01-15 13:37:55 +00:00
9cd7240b61
BouncyBalls, giving errors when Loading, skipping chat stats
2016-01-15 13:28:42 +00:00
ec75169b70
BossBattles, giving errors when Loading, removed chat stats.
2016-01-15 13:07:21 +00:00
3315a510dc
Barbarians stats added + Block break stat tracker added
2016-01-15 13:01:26 +00:00
6a3e9ac19f
BaconBrawl stats added
2016-01-15 12:10:53 +00:00
1faeb43b73
fixed iron block sometimes sticking around after placing cannon
2016-01-15 07:17:51 +00:00
a554f1b7c6
needed to update some code with the cannon item location changing. also removed unused imports.
2016-01-15 07:00:39 +00:00
f78c469875
moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java
2016-01-15 06:59:18 +00:00
e0b7be0813
made /meow give you 64 cannons and 64 outposts
2016-01-15 06:58:20 +00:00
70444ff508
cannon + siege work with outposts, also moved outposts to the clans.siege package
2016-01-15 06:53:58 +00:00
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05:00
cf7f5af9ca
Fixed who the winner is in MB Games.
2016-01-14 07:41:36 -05:00
2e433d8b06
Made sure that the active morph gets disabled on clear
2016-01-14 07:17:40 -05:00
595ab0d763
siege work
2016-01-14 09:46:12 +00:00
d33d682ebb
Implementing stats for every game, got all stat names ready
2016-01-13 18:40:29 +00:00
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05:00
fb53e443e7
cleanup and cannons stuff
2016-01-12 20:27:24 +00:00
f3003e795e
Implemented Outpost MK III
2016-01-12 18:59:01 +00:00
6cde84ec5f
fixed outpost block placing/breaking boundary checking
2016-01-12 18:57:25 +00:00
025f82e5ed
made the forcefield bump much weaker
2016-01-12 16:31:21 +00:00
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +00:00
62f16ada81
that's not the correct bounds!
2016-01-12 07:57:35 +00:00
5b4b5fb2b5
fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries
2016-01-12 07:44:20 +00:00
b1c6af4d1a
Update CB
2016-01-12 20:18:03 +13:00
7d858c72f3
Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-12 07:12:18 +00:00
a6be919e4a
agh lost some code ;-;
2016-01-12 07:10:22 +00:00
ed8d9459b2
goes with the commit below VVVV
2016-01-12 07:02:19 +00:00
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
c873b6b886
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-12 06:58:53 +00:00
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
4e9a4c87d4
Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
025b87c806
Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop
...
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
Muted players can't write on signs.
2016-01-11 16:23:34 -06:00
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +00:00
d656c7a212
fixed clans banned players counting as being online after joining and their territory then being blown up
2016-01-11 18:02:03 +00:00
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
40d913beaf
Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour
2016-01-11 12:35:44 +00:00
b9d44d9a24
not updating properly, fixed
2016-01-11 12:14:29 +00:00
78eaee98df
Typo mistake
2016-01-11 12:09:08 +00:00
ec6e916c7b
more stable, progress for making 'easier-to-use'
2016-01-11 12:06:30 +00:00
3773ab3f0b
fixed safelog npcs sticking around some time
2016-01-11 10:14:32 +00:00
60a78e396f
remove legendary announcement in chat/middle text
2016-01-11 09:16:11 +00:00
6c055c31a0
Fix flashing through doors, Update to 0.18c
2016-01-10 20:39:56 -05:00
d5b5ac7bb0
changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out
2016-01-10 23:06:39 +00:00
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
6673081fb3
fixed LeechingAttribute from throwing an error when setting health above 20
2016-01-10 22:31:51 +00:00
04c7f2c1f1
made pressure plates, buttons, and levers from working with block toss
2016-01-10 22:20:50 +00:00
bccee71ff7
made signs placed by muted players get cleared on being placed
2016-01-10 21:16:49 +00:00
734351011a
made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.
2016-01-10 21:15:50 +00:00
9c3a62a308
made it so punished players can't place signs
2016-01-10 21:03:34 +00:00
68808efb49
made players not be able to chat while chat is silenced
2016-01-10 20:57:12 +00:00
fa3de2a479
made clans ban messages not public
2016-01-10 20:55:29 +00:00
51872faa04
fix mutes not working
2016-01-10 20:53:55 +00:00
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
5caeb8bee0
even nicer visual
2016-01-10 17:34:15 +00:00
c814132b24
ratio's and nicer visuals
2016-01-10 17:33:18 +00:00
83375a6883
stats not updating
2016-01-10 16:01:40 +00:00
1bce624ab3
Finally got rid of MalformedJSON
2016-01-10 15:13:11 +00:00
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
md_5
NewGarbo
Mysticate
Shaun Bennett
phobia
libraryaddict
Virizion
teddy
William Burns
Sarah
Cheese
fooify
Thanos paravantis