20dd9c683b
Merge remote-tracking branch 'origin/master' into monster-maze
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
606937d227
Fixed flashbang glitch
2015-10-11 09:42:36 -04:00
e6485a9009
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 23:02:36 -06:00
5866e0cce6
Reducing max connections for the DBPool to 3.
2015-10-10 23:02:08 -06:00
f23bf18928
adhering to mysts OCD
2015-10-11 14:50:57 +11:00
f3e2f3c145
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-11 14:48:17 +11:00
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
435e74225a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-10 23:35:33 -04:00
83d1e011fc
Changes.
2015-10-10 23:33:54 -04:00
998d5f6984
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 21:25:29 -06:00
061a7b7c73
Fixed Pet FK errors.
...
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
8b75664627
queued holiday transactions
2015-10-11 12:54:35 +11:00
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
72d943f51b
Restored skills to pre-eula ultra
2015-10-10 16:20:28 -04:00
5a8e500ec0
Fixed another thing
2015-10-10 16:15:10 -04:00
5e7ddb968e
Changes and bug fixes.
2015-10-10 15:54:18 -04:00
da6b1316d3
removed pumpkins from MPS
2015-10-10 22:47:19 +11:00
323842c693
fixed mods staying in flight
2015-10-10 19:36:38 +11:00
6f14c75f70
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 19:28:26 +11:00
6cf786eb8c
Merge branch 'Myst_HALLOWEEN'
2015-10-10 19:28:08 +11:00
1026a2ae22
fixed explosions
2015-10-10 19:27:54 +11:00
a242c6b592
Halloween Update finishes
2015-10-10 03:23:37 -04:00
e9207acd7f
Merge branch 'alex-halloween'
2015-10-10 17:38:09 +11:00
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
67a1f4ce8d
Titan Giveaway:
...
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
2015-10-10 02:31:52 -04:00
930cfa5cb8
DONE
2015-10-10 02:30:11 -04:00
f1e9acbb58
Titan giveaway
2015-10-10 02:19:05 -04:00
245a42c8e0
animation is sexi
2015-10-10 02:13:04 -04:00
30a9196430
Done with animation.
2015-10-10 01:43:31 -04:00
9a7357e484
Work
2015-10-10 01:00:49 -04:00
36fabf93b6
Merge remote-tracking branch 'origin/master'
2015-10-09 23:14:13 -04:00
bc7bf8a2e2
fixes/debug
2015-10-09 23:13:39 -04:00
512e08af19
Removed all create table statements.
2015-10-09 21:02:35 -06:00
1127764cc3
Secsi
2015-10-09 22:44:49 -04:00
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
90c685617d
Animation
2015-10-09 22:14:01 -04:00
611fb88f15
Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load).
2015-10-09 20:40:50 -04:00
ed89f5f4cc
anim example for myst
2015-10-10 10:46:12 +11:00
43f38c18ee
animation
2015-10-10 10:40:44 +11:00
d99c64e45d
fixed merge error
2015-10-10 10:37:20 +11:00
02c6eccfda
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
ba36ff565d
Merge remote-tracking branch 'origin/master'
2015-10-09 18:23:55 -04:00
97ef4a4252
Pushing titan giveaway stuff for laptop
2015-10-09 18:23:47 -04:00
586cc6e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-09 09:40:58 -06:00
ff1431b652
Fixed players glitching to chests before game starts.
2015-10-09 10:21:35 -04:00
ff42e05a8d
Merge branch 'Myst_HALLOWEEN'
2015-10-09 14:20:58 +11:00
99fd88473b
rank colors
2015-10-09 14:20:02 +11:00
fb4d08931c
Spider mount improvements.
2015-10-08 23:18:37 -04:00
d9dd471db6
removed annoying debug
2015-10-09 14:04:12 +11:00
c03c8163c5
fixed exploision stuff
2015-10-09 14:01:58 +11:00
90d0fcb36d
Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN
2015-10-08 22:53:45 -04:00
598ea84e7a
Fixed explosions and cleaned up.
2015-10-08 22:52:57 -04:00
d18353e592
Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-09 13:44:41 +11:00
41678eaf35
fixed scoreboard bug
2015-10-09 13:42:37 +11:00
1011c36c43
Fixed lobby being destroyed.
2015-10-08 22:41:45 -04:00
96f14f4fda
Fixed kit item names.
2015-10-08 22:31:20 -04:00
3802d47a37
Made the thing bold.
2015-10-08 22:29:22 -04:00
082b16fe0d
Stuff and things to help make mounts be cool.
2015-10-08 22:28:07 -04:00
54c76c9d9c
fixed text
2015-10-09 12:27:30 +11:00
a234fbce1e
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:17:57 +11:00
ed31bf9886
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-08 21:16:24 -04:00
9254ca9162
K reverted + fixed bug
2015-10-08 21:12:38 -04:00
24568a40f3
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:05:24 +11:00
483ab13c2b
workaround for error where accountid is never set
2015-10-09 12:04:35 +11:00
17ba04348d
stats debug
2015-10-09 11:53:08 +11:00
84cbee4535
Fixed it again
2015-10-08 20:52:17 -04:00
145832b326
Fixed mounts bc chiss is bad
2015-10-08 20:50:39 -04:00
21dc0dc962
Merge branch 'Myst_HALLOWEEN'
2015-10-09 11:47:20 +11:00
ec5694737c
statsmanager debug
...
rank fix
2015-10-09 11:44:12 +11:00
2cace7419f
Made Destructor sexi
2015-10-08 20:42:29 -04:00
92bab25a3f
Fixed Gust void stealing.
2015-10-08 20:38:33 -04:00
b8597d7161
Paintball stats.
2015-10-08 20:37:26 -04:00
cdb9741438
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
2015-10-08 20:36:16 -04:00
97d6f8fb42
Fixed placing walls in water.
2015-10-08 19:10:19 -04:00
8f826f6e83
Fixed blocks falling into floor in Build.
2015-10-08 19:04:51 -04:00
30e3c56635
Fixed ground issues in BUILD.
2015-10-08 18:58:30 -04:00
46bf963d44
Fixes not being able to reload dropped guns w/ 0 ammo.
2015-10-08 18:56:23 -04:00
979e68dcc7
Fixed the Minestrike multiple grenades bug.
2015-10-08 18:41:40 -04:00
ef62fb5adf
Made it so that when played on an MPS, HH won't give items. Yay!
2015-10-07 22:57:30 -04:00
8a8591ae7f
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
2015-10-07 22:19:10 -04:00
668454f156
Fixed things
2015-10-07 22:10:57 -04:00
f2485854ef
Improved spider.
2015-10-07 22:06:57 -04:00
70f3ccf703
Fixed spider morph
2015-10-07 21:53:23 -04:00
e864e0867a
Adds mount spider and fixes a BH bug.
2015-10-07 21:47:10 -04:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
191392825f
Merge branch 'Myst_EVO'
2015-10-08 12:07:21 +11:00
f28d83cbd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-08 12:05:51 +11:00
c94184c5ae
reduced number of falling blocks in skywars by 80%
...
added halloween horror mount
2015-10-08 12:04:28 +11:00
5378ece214
Fixed chicken being able to fly..
2015-10-06 21:09:53 -04:00
a0d0590777
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-10-06 21:04:49 -04:00
8fb82507e1
Merge remote-tracking branch 'origin/master'
2015-10-06 12:24:34 -04:00
9cb3f250e2
Remove streak record data until a better solution is done
2015-10-06 12:24:16 -04:00
e2e2356b04
stuffs
2015-10-06 13:25:15 +11:00
643f47763e
Improved consistency with the F5 message
2015-10-04 20:28:21 -04:00
0de34c15ab
NO more endercrystal go boom boom yay
2015-10-04 20:23:41 -04:00
9c1ba5f3d1
Changes on bomb error messages after QA recommendations.
2015-10-04 21:23:50 +03:00
0eeea58a01
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 11:50:20 -05:00
9f1c4653f4
Fix for Customer support item command with the removal of item categories.
2015-10-04 11:48:16 -05:00
6c73b1a5ac
Start moving i18n into master.
2015-10-04 15:24:58 +01:00
c2518bc6c4
Some additional bug fixes were applied on the previous commit.
...
Water damage by TNT on game lobbies is now patched.
2015-10-04 16:32:34 +03:00
026c596de2
Minestrike bug fixes and minor changes
...
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
2015-10-04 13:22:12 +03:00
f9ea325da1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 00:24:11 -05:00
ba17404212
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 00:20:52 -05:00
1830705692
Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be.
...
Increased Firework recharge time.
2015-10-04 00:20:41 -05:00
2504493ebc
Fixed four super paintball bugs.
...
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
2015-10-04 00:34:00 +03:00
a7ab0cd723
ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS
2015-10-02 22:43:29 -04:00
c9ff420a79
Now chooses a different maze every game.
2015-10-02 20:43:57 -04:00
17fbd42b9c
Fix bug where a players inventory was not properly updated after switching to SURVIVAL mode, causing CustomGear items to remain unhidden an JSON encoded.
2015-10-02 14:30:39 -04:00
a110cd6d9c
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-10-02 13:58:06 -04:00
661bba3714
Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description.
2015-10-02 13:57:46 -04:00
993c9783ec
Add Votifier Jar, display team stats for SG, SW, SSM
2015-10-02 13:15:02 -04:00
9c38e8039e
Add clans to compiler
2015-10-01 22:59:42 -04:00
5bce1b5f2e
Fix merge issues, fix observer command
2015-10-01 22:57:39 -04:00
8911617a0c
Remove BungeeSigns again?
2015-10-01 14:01:36 -04:00
3f6490f14a
Gave health on safe pad <<<<<3
2015-10-01 10:47:37 -04:00
bc84dc6817
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-01 07:39:17 -07:00
631bd9cfa6
Removed sale notification.
...
Removed queue create table query.
Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
2015-10-01 07:38:59 -07:00
a6d7cccbe5
Fixes
2015-09-30 22:31:03 -04:00
4a023c4644
Tweaks - I THINK I'M DONE HOORAY
2015-09-30 21:21:29 -04:00
05b735ba40
Fixed jump system
2015-09-30 20:28:35 -04:00
c39806a4e3
Kewl stuff. Yay
2015-09-30 20:01:51 -04:00
09ef2d73ae
Grammar <3
2015-09-30 19:45:29 -04:00
b8cc967fb0
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Hub/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-30 19:32:33 -04:00
68c6ba595e
Visual enhancements.
2015-09-30 19:31:36 -04:00
d089ffeb30
Added a firework when a mob gets rekt
2015-09-30 18:48:45 -04:00
250e9cff13
Fixed a possible NPE
2015-09-30 18:43:52 -04:00
a25e2c575d
Peace of mind stuff.
2015-09-30 18:35:56 -04:00
86cdd7a30e
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-10-01 04:39:26 +13:00
c3b2c10934
FINALLY FIXED THIS MONSTER MAZE BUG :D
2015-09-29 19:14:18 -07:00
d870ff6f11
Fix bug where Fissure could be exploited with Arctic Armour for 'water bending', allowing players to artificially create Water towers by bending temporary ice.
2015-09-29 18:47:24 -04:00
b4c9bfbb57
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Hub/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
ab1ac379a7
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-09-29 17:36:51 -04:00
bc7615a5c3
Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players.
2015-09-29 17:36:42 -04:00
f8ef46abde
Merge master code into clans
2015-09-28 21:41:05 -04:00
2d173a5be4
Fixed a jumper perk.
2015-09-28 21:03:58 -04:00
14027b9780
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-09-28 21:03:00 -04:00
bcfd8fcec7
bug fixes:
...
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
2015-09-28 17:54:56 -07:00
437e62c7db
Fix priority for dupe fix
2015-09-28 20:44:57 -04:00
8a9cc9ff14
Food Dupe Fix
2015-09-28 20:42:14 -04:00
00eecc0325
Fixes
2015-09-28 20:33:38 -04:00
3a10677b10
AI bug should be fixed, I need Mysticate to test though
2015-09-28 15:15:51 -07:00
92436c8f9d
Merge pull request #60 in MIN/mineplex from alex-bugfixes to master
...
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
Made rank unlock lore colored based on rank required for item (QA Requested)
Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
Marked the Bunny Morph to reflect its no longer available status
Fixed previous ownership not being transferred
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-09-27 22:39:50 -05:00
00a8cf769b
Swag
2015-09-27 14:55:37 -04:00
7e40d0d4bb
Lots of cool stuff
2015-09-27 12:10:52 -04:00
eea7ef8350
Swag
2015-09-27 02:11:28 -04:00
54eca7fa9e
Lots of work.
2015-09-26 23:18:05 -04:00
eae894c879
Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '436f63860ecef028d23dae28ceb52e466e90270b':
NBT overflow patch
2015-09-26 17:32:30 -05:00
ee5934c7aa
Fix for punishments to match names exactly
...
Fix for expiring ranks.
Fix for EU Lobby count.
2015-09-26 18:31:37 -04:00
1ad61a09e4
Should include the file with the change commit.
2015-09-26 18:30:45 -04:00
0d8ef7fea3
Fixed lobby balancing technique.
...
Removed random UUID for bungee redis database.
Enabled bungee name in debug output for bungee rotator.
2015-09-26 18:25:29 -04:00
9350386361
Lots of things. :D
2015-09-26 15:08:43 -04:00
8e9a3e90a7
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
2015-09-26 00:00:46 -04:00
30d2281785
Lots of things
2015-09-25 23:59:31 -04:00
1e018cf74a
Improved Smasher
2015-09-25 20:21:06 -07:00
2de409c2f2
Made the mazes do things.
2015-09-25 20:14:46 -04:00
436f63860e
NBT overflow patch
...
Patch for the NBT overflow exploit which allowed any player to overflow
and drain the server for memory making it freeze and eventually crash.
2015-09-26 01:48:38 +02:00
a0ec656bc1
Fixed another tracker.
2015-09-25 12:49:21 -04:00
b2f1f7d2ae
Fixed the tracker for pilot.
2015-09-25 11:38:32 -04:00
1394df03e0
For now, set all boss battles games to spider
2015-09-25 16:43:53 +12:00
e66d8765e7
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 23:02:27 -04:00
60c4e5812a
Fixed trackers
2015-09-24 23:02:19 -04:00
69ed764483
Added another maze.
2015-09-24 19:55:43 -07:00
e94eb056dc
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-25 14:09:18 +12:00
2a77eda4fc
Spider boss code
2015-09-25 14:08:47 +12:00
69517a3dcb
Refresh the name after custom stuff is done so it applies on disguises
2015-09-25 14:08:27 +12:00
34d535f153
Fix custom tags, improve Packet handling
2015-09-25 14:07:51 +12:00
fa30ba1e16
Fix a small issue with Future Disguises
2015-09-25 14:07:12 +12:00
e8725b38ab
Colorize the messages for when a /game start fails
2015-09-25 14:06:35 +12:00
a9f20a573c
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 21:10:31 -04:00
9a70d4997a
Fix
2015-09-24 21:10:12 -04:00
d9b6d8f0e3
Changes
2015-09-24 21:01:18 -04:00
cd33bf8dd8
- Fixed updaterank and testrank scoreboard conflict
2015-09-24 11:47:50 -04:00
a488bfab3e
- Rewritten testrank system
...
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
7445fda922
Made the thing a lot better. Yay! :D
2015-09-24 11:04:05 -04:00
4663aa3eaa
updated mazes
2015-09-24 07:29:48 -07:00
5de016c077
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 23:46:21 -04:00
842da3d6fb
Tons of changes.
2015-09-23 23:44:10 -04:00
a301c87efc
workstuffchanges on monster maze
2015-09-23 19:23:21 -07:00
9a3ef895c9
Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
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.
2015-09-23 19:37:48 -05:00
125b823a65
Fixed achievement arcade page size.
2015-09-23 15:43:14 -04:00
71408fabd2
One thing.
2015-09-23 15:24:34 -04:00
81e780d400
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
0ad91a6b0b
more changes! :D
2015-09-23 07:10:48 -07:00
2b902c5193
Add created by, enabled by, and disabled by to botspam module
2015-09-23 00:25:39 -04:00
3a8fd18d2e
Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8.
2015-09-22 15:28:06 -05:00
3ae043e7d8
Merge remote-tracking branch 'origin/master'
2015-09-22 01:38:52 -04:00
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
86420132ce
Clan name->uuid changes
2015-09-21 20:05:16 -04:00
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07:00
452e8a9694
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-19 12:11:21 +12:00
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
901dad2f8a
Add vote3 to bonusmanager
2015-09-17 22:31:18 -04:00
6a4c9061fa
Supply drop, loot, small fixes
2015-09-17 22:19:45 -04:00
aa30c866fd
flurrry
2015-09-18 10:22:16 +10:00
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
655283e008
Progress on spider
2015-09-14 23:23:12 +12:00
ac269839c5
squid skill
2015-09-14 14:14:06 +10:00
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
aa8cb8943e
more work on monster maze
2015-09-13 08:42:26 -07:00
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
55ac104e2c
took forever to get it working, but the maze parsing works! :)
2015-09-12 09:50:06 -07:00
1417d31b73
Added 60s delay to timings enable check.
2015-09-11 23:57:26 -07:00
c9971bb117
fixed duplicate rank name
2015-09-12 16:45:22 +10:00
6216f2ced4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-12 16:33:44 +10:00
a7d4a7534f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-11 22:51:04 -07:00
2380b9041d
Added automatic timings report in the event of lag.
...
Added more exception handling around LoadingWindow
2015-09-11 22:50:53 -07:00
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
b56813deef
Improving /e commands (/e kick, /e area, etc)
2015-09-12 04:33:10 +02:00
0bafae6485
Fix bug where certain damage events threw excessive NPEs based on spawn protection checks.
2015-09-11 17:09:50 -05:00
9be0ecc598
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java
Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.
2015-09-11 17:01:04 -05:00
b4248a3d5b
Fix bug where Assassins could teleport outside of the Borders (causing their death) with several skills. Fix bug where crafting denials for certain items were not properly communicated to the user. Clean up use-cases for cancelling fishing to prevent players from not being able to use their class abilities. Fix bug where pigs could be struck my lightning using class abilities, spawning in pig zombies that could be farmed for gold.
2015-09-11 16:04:52 -05:00
5a79c51506
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-10 13:57:48 +10:00
a4cc70c3f0
new small youtuber rank
2015-09-10 13:17:11 +10:00
15b51fe575
Fix bug where Fissure skill travelled through doorways as well as increase cooldown. Fix bug where Cobwebs could be thrown inside spawn safe zones and increase cooldown. Modify StaticLazer skill's range, damage, cooldown, and damage radius for balance purposes. Remove the ability to craft TNT Minecarts and Jukeboxes. Disable fishing ability in Clans. Add the requirement that players must crouch while clicking on furnaces to be able to smelt. Fix bug where Axes weren't considered a weapon in the context of player murders.
2015-09-07 20:39:34 -05:00
5824ec6df0
lots of changes to monster maze, check trello for list
2015-09-07 07:08:00 -07:00
4240026024
Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.
2015-09-06 18:55:00 +02:00
6474f5a9e9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-06 16:23:18 +12:00
5712af8ddc
Adding Redstone function signs for events.
2015-09-05 20:38:51 +02:00
c648d7c186
stuff, things...things, stuff (Monster Maze)
2015-09-05 09:30:51 -07:00
9e3f87b71e
more edits to MM
...
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
2015-09-05 06:41:10 -07:00
4bb100b6be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-05 01:53:45 -07:00
4ad95b54cf
Updated ServerMonitor status reporting for network.
2015-09-05 01:53:37 -07:00
2536d8a437
Fixed out of range stats causing no stats to load.
...
Issue fix to db for out of range stat on login.
2015-09-05 01:40:56 -07:00
0ac808ba43
stacker pref is now only for pvp stacking.
2015-09-05 10:30:11 +10:00
fc5ccd4a5e
fixed 'self scoring' in Soccer
...
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
106a7dab2e
removed ability for entities to change blcoks in hub
2015-09-05 09:48:06 +10:00
271b86dabd
Fixed spectators slowing evolution times.
2015-09-04 11:45:42 -04:00
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
921292a5c6
Added timings capture and server log copy on server kill inside server monitor.
2015-09-03 09:38:26 -07:00
890c9d59e1
Fixed loading window bug.
...
Added default rank for CoreClient in case of bugged login.
2015-09-03 09:38:02 -07:00
0c58de3c19
Glitches. Fixed the things.
2015-09-01 02:35:06 -04:00
b4ce33a916
Fixed things.
...
• Added a cancelled check to No Ability
• Removed tokens on quit.
• Checked if players are alive before giving them places.
2015-09-01 01:59:36 -04:00
8a94602aef
Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
2015-08-31 16:03:27 -04:00
fe4586852c
Made rank unlock lore colored based on rank required for item (QA Requested)
2015-08-31 15:59:53 -04:00
cbb0d4521c
Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
2015-08-31 15:49:31 -04:00
5322e9d018
Marked the Bunny Morph to reflect its no longer available status
2015-08-31 15:48:25 -04:00
24fed013ae
Fixed previous ownership not being transferred
2015-08-31 15:39:04 -04:00
32a257fa55
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
2015-08-31 15:11:57 -04:00
b63843930f
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-08-31 15:08:42 -04:00
503b68da2f
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-08-31 11:32:47 +02:00
58ae09ebd4
saving Project for pulling.
2015-08-31 11:32:18 +02:00
c61f9ce3c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-31 00:53:23 -07:00
740899c09e
Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird
...
Fixes Lobby crashes.
2015-08-31 00:53:07 -07:00
7c53feec71
Add axes and bows to murder detection
2015-08-30 17:59:46 -07:00
becfbe1f13
Fixed possible game breaking bug :S
2015-08-30 20:09:47 -04:00
fa0fd062d4
Allow Media to join server, Supply drop work
2015-08-30 17:08:56 -07:00
eba98e7e7c
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-30 17:05:57 -07:00
6bb4e69236
Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies.
2015-08-30 17:05:45 -07:00
d79794c6d3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-30 15:47:57 -07:00
bb66d47e8e
meow
2015-08-30 15:47:49 -07:00
33d78a5efd
Fixed eating spider eye. Yay!
2015-08-30 18:39:07 -04:00
b0efe35531
Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub.
2015-08-30 13:14:01 -07:00
1b6833ae16
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-30 12:41:22 -07:00
5d77202370
Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss
2015-08-30 12:41:15 -07:00
ab73cc2fbe
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-30 12:28:55 -07:00
54f910845e
Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop.
2015-08-30 12:28:44 -07:00
908d11ead5
Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query
2015-08-30 12:00:58 -07:00
47331658ac
Merge remote-tracking branch 'remotes/origin/Myst_EVO'
2015-08-30 00:14:53 -07:00
b59511ece4
Added duplicate login kick for network.
2015-08-30 00:12:54 -07:00
7047bbf8f6
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 19:06:20 -07:00
c1b356e42f
Fix asynchronous race conditions in ServerData.
2015-08-29 19:05:14 -07:00
4b7a4a4d5c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 18:58:43 -07:00
cbab8861d8
SNakes!!
2015-08-29 18:58:33 -07:00
bcdd72558d
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 18:58:21 -07:00
368ed955ea
qwrwr
2015-08-29 18:58:12 -07:00
36a22caa1e
Fix bug where lastOnline stat for clans wasn't properly loading on server transfer.
2015-08-29 18:23:04 -07:00
4e045f438d
Prevent fire from burning blocks in spawn areas.
2015-08-29 18:12:43 -07:00
606e9e8318
Fix bug where serverId column was referenced.
2015-08-29 18:08:18 -07:00
f5b9aca708
Fix bug where serverId column was being referenced in table after it's removal.
2015-08-29 18:04:50 -07:00
da3810e5a3
Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.
2015-08-29 17:57:18 -07:00
138a4cf638
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 17:43:12 -07:00
f47c1b5c14
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 17:33:08 -07:00
b0c657b5c0
Fix bug where generator location per-clan wasn't being reset properly on server transfer.
2015-08-29 17:33:01 -07:00
5df7a5e0c9
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 17:31:54 -07:00
4dbd2d3586
Reduce login kick time
2015-08-29 17:28:47 -07:00
caf82ad606
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 17:18:24 -07:00
c27fdf023c
Fix login manager and stats manager
2015-08-29 17:18:14 -07:00
f4ade8e9f7
Snnkes
2015-08-29 17:05:47 -07:00
820bc1af44
Setup new module for intellij, fix field ore
2015-08-29 16:56:26 -07:00
50b6bfbe1a
snake
2015-08-29 16:54:23 -07:00
a76610e21e
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java
2015-08-29 16:47:47 -07:00
6bd29394b3
snake
2015-08-29 16:46:55 -07:00
e2e0756b9f
Snakes anyone?
2015-08-29 16:43:40 -07:00
05ecfb8ff0
snake workin!
2015-08-29 16:33:35 -07:00
110222e5f3
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 16:02:21 -07:00
64b9cd201c
snake crap
2015-08-29 16:02:14 -07:00
227a077dba
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
2015-08-29 15:53:42 -07:00
197309b914
Commit left-over changes to merge and pull.
2015-08-29 15:44:29 -07:00
5db4a55dda
Enable clans login manager
2015-08-29 15:41:37 -07:00
16b317a877
Forgot to remove debug code
2015-08-29 15:17:03 -07:00
9ad39c1fe7
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 15:09:08 -07:00
4aee4f8fd7
Fix generators
2015-08-29 15:09:02 -07:00
6ae801314c
Fix spawning
2015-08-29 15:07:51 -07:00
9a1469f6b0
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 15:03:32 -07:00
5030ae7d57
For Chiss, may the code never break.
2015-08-29 15:03:22 -07:00
c2c23c22e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-29 14:55:04 -07:00
4e32bad8dd
Fixed bug with stats pulling as int.
...
Fixed bug with Poll recording selections wrong.
2015-08-29 14:54:57 -07:00
088068be80
Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers.
2015-08-29 14:51:17 -07:00
aad5942242
Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.
2015-08-29 14:46:18 -07:00
5b534313f5
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 14:37:43 -07:00
8f1da698d2
TNT generator storage in mysql (needs testing still)
2015-08-29 14:37:35 -07:00
eb6a0c9e38
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 14:27:54 -07:00
efd435396f
snake
2015-08-29 14:27:40 -07:00
16d807db2e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 14:01:45 -07:00
62cf58bd55
Fix a bug where claiming a new land would display that land as neutral
2015-08-29 13:56:26 -07:00
f0f9a4c674
Push it like a pushy pushy lady.
2015-08-29 13:46:09 -07:00
b7b81ecaaa
snake
2015-08-29 13:38:40 -07:00
fae27df496
Add ClansLoginManager, TNT Generators (Still needs persistence)
2015-08-29 13:35:31 -07:00
046fa4f8b6
Fixed possible NPE
2015-08-29 14:30:22 -06:00
736d88c82f
All achievements fixed. ^_^
2015-08-29 14:13:15 -06:00
d2bc4b8cb4
SNAAAKE
2015-08-29 13:13:04 -07:00
5d28509474
Snakes tail final location instead of rel movement
2015-08-29 12:38:19 -07:00
bd2fda17b0
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 12:07:23 -07:00
7cd98c82e9
Refactor and move BossAbiliy
2015-08-29 12:06:57 -07:00
e7f861a6c2
Push golem changes, snakes code and rename bossability thingy
2015-08-29 12:04:53 -07:00
97c7980bbc
Fixed evolving into walls.
2015-08-29 10:54:04 -06:00
55a7ea0439
Fixed kit bug.
2015-08-29 10:44:11 -06:00
9ebabed1a8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-29 00:14:26 -07:00
6a28845cb0
Merge branch 'Myst_EVO'
2015-08-29 00:14:15 -07:00
12d9888a1f
Fixed wins..
2015-08-29 00:58:53 -06:00
f8729cbd66
Fixed Gadget.
2015-08-28 23:47:27 -07:00
d35b5940fc
fixed achievements
2015-08-28 23:30:21 -07:00
5ae01f95a8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-28 23:27:35 -07:00
181afaa2d6
Merge branch 'Myst_EVO'
2015-08-28 23:25:51 -07:00
b71bcfab4b
Fixed achievements. Merge ASAP
2015-08-29 00:19:39 -06:00
d4d0c4bed6
Updated Motd.
2015-08-28 23:17:14 -07:00
c98a85c2ba
Added local storage of login time.
...
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
ba4da32939
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-28 21:44:07 -07:00
e47662f855
Added LoginTime setting as RedisTime for use in calculating time on server.
...
Optimized redis util for time calls to calculate time different and only pull redis time once.
2015-08-28 21:44:00 -07:00
829c1d2ae8
Merge branch 'Myst_EVO'
2015-08-28 21:30:10 -07:00
c40fecb03f
Removed warning from private servers
2015-08-28 22:06:13 -06:00
041c5ab53c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-28 21:00:34 -07:00
3f1c4d24b9
Merge branch 'Myst_EVO'
2015-08-28 21:00:00 -07:00
ad4ba010b7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-28 20:59:08 -07:00
6f0309622c
Removed AccountCache.
...
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
bb09720450
removed previous commit jesus
2015-08-28 21:56:35 -06:00
d68f1fa547
Merge branch 'Myst_EVO'
2015-08-28 20:50:27 -07:00
6628f5a1ae
Added a checker for a no kit issue
2015-08-28 21:49:57 -06:00
19b2ff5b58
fixed scoreboard
2015-08-28 20:48:32 -07:00
11cc4a6cea
removed msg
2015-08-28 20:45:59 -07:00
fda866a33f
Merge branch 'Myst_EVO'
2015-08-28 20:35:59 -07:00
4466c10441
FIXED
2015-08-28 21:35:31 -06:00
4ac6b22e53
Merge branch 'Myst_EVO'
2015-08-28 20:31:56 -07:00
88ca205474
fixes
2015-08-28 20:31:29 -07:00
815add4c59
FIXED THE THIGNS
2015-08-28 21:28:39 -06:00
5777309d18
Merge branch 'Myst_EVO'
2015-08-28 20:07:22 -07:00
8238a199d5
gem stuff
2015-08-28 20:06:39 -07:00
cc60371c1f
Fixed perk cancelling on death
2015-08-28 21:04:35 -06:00
d879bc68ab
Merge branch 'Myst_EVO'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
2015-08-28 19:59:48 -07:00
b5b8bef39e
evo fixes
2015-08-28 19:58:51 -07:00
d6c8e51104
Things ^_^
2015-08-28 20:57:47 -06:00
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
abf1f23087
double gem
2015-08-28 19:16:49 -07:00
56aa235e56
Fixed kit messages
2015-08-28 19:25:52 -06:00
676817601a
Prevent players from logging into the wrong clans server
2015-08-28 17:31:09 -07:00
c8c569281b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-28 16:18:49 -07:00
5562345c05
Merge branch 'SarahsAwesomeBugFixes'
2015-08-28 16:02:40 -07:00
3be6483ed3
editing /game set for test servers.
2015-08-29 01:01:05 +02:00
2d770a8dd1
More final tweaks.
2015-08-28 16:36:35 -06:00
513662e6e3
Fixed the block open flag.
2015-08-28 15:46:38 -06:00
f21ca35638
Final bug changes.
2015-08-28 15:44:41 -06:00
35c79804ac
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-28 14:17:22 -07:00
825dd66283
Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones.
2015-08-28 14:17:11 -07:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
c51a449df3
Enable caching for clans, update craftbukkit jar
2015-08-28 13:10:30 -07:00
6f39c072a4
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-28 12:57:13 -07:00
7761ca7e6f
Remove debug messages
2015-08-28 12:56:43 -07:00
5cdf31d0e6
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-28 12:52:12 -07:00
b98cde8b80
Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.
2015-08-28 12:52:02 -07:00
cd145324d8
Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit
2015-08-28 12:00:23 -07:00
249ecdd381
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-28 11:42:53 -07:00
1f5cd624a4
Fix up iron golem, add slam attack
2015-08-28 11:42:33 -07:00
571d992dbe
Fixed a few bugs.
2015-08-27 20:47:55 -06:00
6a330a66d9
Fix bug with Building shop materials not properly being purchased in bulk. Modify the notification message for combat tagged players in safezones to display on the middle of the screen instead of chat.
2015-08-27 15:46:57 -07:00
2e4c27cb11
Merge pull request #45 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '4ddc82f8204e322373b54c50308dc6bdb29f59b3':
Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class
2015-08-27 16:56:41 -05:00
ff13f51151
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-27 14:55:33 -07:00
4ddc82f820
Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class
2015-08-27 14:54:56 -07:00
4f2d861b21
Fix chat bug, enable TablistFix for clans
2015-08-27 14:53:52 -07:00
783f526b76
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-27 14:42:41 -07:00
4dcd54a9b0
Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.
2015-08-27 14:42:07 -07:00
379ee9271a
Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta
...
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
Iron Wizard, fixed iron golem custom name
Push golem block shot as per request
2015-08-27 16:34:46 -05:00
e86bca99fd
Clans Chat
2015-08-27 14:33:50 -07:00
9d3f125c9e
Iron Wizard, fixed iron golem custom name
2015-08-27 14:18:10 -07:00
b0ee2bb669
Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items
2015-08-27 13:57:57 -07:00
102fcd8e73
Push golem block shot as per request
2015-08-27 11:10:17 -07:00
adfc451e9f
You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift
2015-08-27 09:33:44 -07:00
f2f6afb6ca
Fixes :D
2015-08-26 20:10:58 -06:00
Mysticate
Jonathan Williams
Cheese
Shaun Bennett
AlexTheCoder
Peter Miller
Shaun Bennett
Thanos paravantis
alexmack929
Ty Sayers
libraryaddict
fooify
xGamingDudex
Sarah
Mini-Chiss
Ty Sayers
libraryaddict