993c9783ec
Add Votifier Jar, display team stats for SG, SW, SSM
2015-10-02 13:15:02 -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
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
c3b2c10934
FINALLY FIXED THIS MONSTER MAZE BUG :D
2015-09-29 19:14:18 -07:00
2d173a5be4
Fixed a jumper perk.
2015-09-28 21:03:58 -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
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
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
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
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07: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
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
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
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
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
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
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
becfbe1f13
Fixed possible game breaking bug :S
2015-08-30 20:09:47 -04: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
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
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
046fa4f8b6
Fixed possible NPE
2015-08-29 14:30:22 -06:00
736d88c82f
All achievements fixed. ^_^
2015-08-29 14:13:15 -06: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
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
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
571d992dbe
Fixed a few bugs.
2015-08-27 20:47:55 -06:00
f2f6afb6ca
Fixes :D
2015-08-26 20:10:58 -06:00
a351a8f1ed
Minor improvements.
2015-08-26 13:47:01 -06:00
cfdb0dfa4f
Added kits + achievements. Hurrah!
2015-08-26 13:19:17 -06:00
988382375f
Started adding kits
2015-08-25 23:36:18 -06:00
61c80fd31d
Fixed issue with player login sessions.
2015-08-24 20:21:14 -07:00
b64a75cbf3
Added maintenance message.
2015-08-24 18:35:11 -07:00
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
549435224f
changes to monster maze!
2015-08-24 09:58:07 -07:00
6249dadf91
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-23 16:27:47 -07:00
6d3c965f14
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-23 16:26:02 -07:00
74fd729975
Updated BungeeCord to latest version.
2015-08-23 15:48:03 -07:00
fec8398608
UPdated ChestConverter to convert stats.
2015-08-23 15:47:03 -07:00
34a5d9c722
Updated MotdManager to update both repositories.
2015-08-23 15:46:23 -07:00
1e7f2f01a7
Fixed problem where UUID api was preventing client loading from db.
2015-08-23 15:38:43 -07:00
d454d73ccb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-23 11:32:48 -07:00
69ff514bf8
changed perms on write
2015-08-23 11:31:32 -07:00
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
cdc92f8b2f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-22 00:38:55 +12:00
7841b17d03
Add PacketPlayOutCamera for locking view to entity
2015-08-22 00:38:37 +12:00
bad339cf04
Tweak dead bodies more
2015-08-21 20:52:57 +12:00
c41328d726
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 20:40:09 +12: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
86ad6a09de
Used armor stands for evolving.
2015-08-20 13:04:22 -04: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
f97da1bdba
Merge branch 'SarahsAwesomeBugFixes'
2015-08-19 16:33:37 +02:00
6e926b431c
Fixing snowballs and eggs in Solo Skywars.
2015-08-19 16:00:36 +02:00
bbe5b79c7e
Disabled AntiHack create table.
...
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
3d7c81a3b4
fixed game tips
2015-08-19 08:15:22 +02:00
64990ed356
Fixed parse distance.
2015-08-18 21:37:52 -04:00
859a7e07d5
added the optional functionality
...
to include air blocks in the util
method getInBoundingBox()
2015-08-18 16:46:20 -07:00
15eba5b491
added more y velocity
2015-08-18 12:22:34 -07:00
53395a7700
Made player immovable whilst evolving.
2015-08-18 13:07:46 -04:00
14bf8faf3a
disabled big sale
2015-08-18 09:49:53 +02:00
d489b31738
merge
2015-08-17 16:27:28 -07:00
a47022d242
Merge remote-tracking branch 'origin/master' into monster-maze
2015-08-17 14:54:19 -07:00
9343bc0048
trying to merge
2015-08-17 14:53:59 -07:00
75a4b3d568
Changes to make evolving easier
...
• Speed 1 on kill
• Evolve chargeup decreases 1.5 seconds per kill.
2015-08-17 10:36:28 -04:00
b7854e6cab
added big larry to chests
2015-08-17 13:05:41 +02:00
9eed03237b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-17 12:39:06 +02:00
58e517a4d7
fixed null args more
2015-08-17 12:38:41 +02:00
8ab8388344
Merge remote-tracking branch 'origin/master'
2015-08-17 05:05:36 -05:00
5c71522b2d
Return the first UUID instead of last (AccountRepository)
2015-08-17 05:05:25 -05:00
0a23f91592
fixed two little bogs
2015-08-17 11:53:50 +02:00
dc8bec340e
Rename Quick game menu for consistency
2015-08-17 03:18:35 -05:00
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
993ed0a92d
Fixed a possible NPE
2015-08-16 22:38:59 -04:00
8cc5ff042c
fixed block hunt gem exploits
2015-08-16 09:33:15 +02:00
91ce9cfba7
fixed a crash with fireworks
2015-08-16 08:39:03 +02:00
8584e0355a
final fix!
2015-08-15 12:32:03 +02:00
ba6806935d
fixed better
2015-08-15 12:31:19 +02:00
6ac586790d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-15 12:27:30 +02:00
25f93bac2e
fixed logic on setgame
2015-08-15 12:27:11 +02:00
555908a3c1
Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo
2015-08-15 02:03:46 -05:00
27da9b64b6
Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-15 07:40:40 +02:00
96dc86a481
Fixing map rotation.
2015-08-15 07:34:04 +02:00
2659dd4e39
Fixed minor bugs. Head now follows mob altitude.
2015-08-14 23:17:56 -04:00
fda052ea90
Add treasure chest stats
2015-08-14 21:34:37 -05:00
e89961380b
Merge remote-tracking branch 'origin/master'
2015-08-14 21:14:41 -05:00
1eaa6446af
Fix double hologram and hopefully NPE
2015-08-14 21:14:34 -05:00
c520bd7921
Add recharge to carl spins so that they don't get triggered twice
2015-08-14 20:43:58 -05:00
ac18dd3b79
Fixed iron golem select message. Removed slot change message.
2015-08-14 20:22:00 -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
a2d7aa77fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-14 00:37:55 -05:00
f5d934fe53
Fixed sync db calls for pets.
...
Make sure to add/remove pets in mysql.
2015-08-14 00:37:43 -05:00
80588a308b
balanaced brawler
2015-08-13 21:03:48 +02:00
7157aaee2b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 20:56:20 +02:00
a1ba2cffac
fixed needler not doing posion
2015-08-13 20:56:02 +02:00
0b4dbab871
Change ticket command access to admin
2015-08-13 11:23:29 -05:00
bd7317cf7b
Fix ticket command rollback >:D
2015-08-13 11:03:12 -05:00
eaad787075
Removed the base kit and replaced it with Iron Golem.
2015-08-13 08:16:33 -04:00
5fa9135b08
renamed soccer to slimeball :)
2015-08-13 14:11:22 +02:00
6ef3215516
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 13:25:41 +02:00
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
94c00cdb72
Adding some comments
2015-08-13 04:05:28 -05:00
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
ed7dbddf4a
Redid how kits are done.
2015-08-13 00:12:28 -04:00
d7e28e9eb8
You can no longer have the option to Evolve if you kill while dead.
2015-08-12 13:28:31 -04:00
4f163af909
fixed a uid problem with maps
2015-08-12 18:36:29 +02:00
a7da10cb34
You no longer remain "charging" when you die.
2015-08-12 12:12:26 -04:00
ad94b63903
Blaze and Enderman now take water damage.
2015-08-12 10:46:12 -04: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
fcfb2559b8
players cannot grab slime :O
2015-08-12 14:41:33 +02:00
d1302e8dc3
fixed full msg
2015-08-12 12:42:59 +02:00
5293e24469
fixed text
2015-08-12 11:58:40 +02:00
cd5c7e7110
fixed kb
2015-08-12 11:23:19 +02:00
37e5e97020
Fix experience reward displaying as game
2015-08-12 03:08:40 -05:00
f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
e8963cc2af
fixed paintbrush
2015-08-12 08:10:43 +02:00
2ed388552b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 07:59:39 +02:00
99a94251fd
Fixes
2015-08-12 00:56:20 -05:00
8e4ae35256
Merge remote-tracking branch 'remotes/origin/master' into Bonus
2015-08-12 00:56:04 -05:00
4549c810d4
Fix for voting
2015-08-11 22:59:59 -05:00
a7cc3e1aa6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-11 21:13:59 +02:00
d41ab3432f
remove paintbrush when moved away
2015-08-11 21:13:45 +02:00
72adf21bff
Gadget Paintball: Add particles on impact, change block break effect to stone break sound.
2015-08-12 06:23:13 +12:00
07bdbdde46
minor grammar issue
2015-08-11 09:55:10 -07:00
ddc663cc75
remove duplicate method
2015-08-11 09:52:04 -07:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
356060eedc
more amazing changes
2015-08-11 09:41:26 -07:00
c6ec60700c
monster maze is really working now! :D
2015-08-11 09:04:45 -07:00
18843c2cc6
Merge branch 'Bonus'
2015-08-11 17:05:59 +02:00
83a010c215
enabled summer sale msg
2015-08-11 17:05:41 +02:00
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
f7d9476191
Hidden egg fix
2015-08-11 13:53:36 +02:00
5c7d140521
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 13:49:53 +02:00
e25558fc91
Animation improvements.
2015-08-11 13:49:06 +02:00
cfcfbbed3b
removed double gem
2015-08-11 13:34:32 +02:00
49d54d4dd3
doesnt count rank thingy as reward if no rank. yknow
2015-08-11 13:22:58 +02:00
b348c62a3f
Merge branch 'EventGameUpdates'
2015-08-11 13:01:33 +02:00
2d7d7f6dde
Improving messages, animations and some Items.
2015-08-11 13:01:20 +02:00
f3558b144c
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 12:05:23 +02:00
c821523240
removed vote broadcast.
2015-08-11 12:04:54 +02:00
1c484367a1
Add hasPoll
2015-08-11 04:57:45 -05:00
3eb7e91fbb
Removing the magical 3
2015-08-11 04:38:37 -05:00
8abefaf856
The magical +3.
2015-08-11 11:31:51 +02:00
4c32f32ced
removed game reward type
2015-08-11 11:17:20 +02:00
74b83d6851
fixed!
2015-08-11 10:56:07 +02:00
184feec875
cleany and logic
2015-08-11 10:54:24 +02:00
f66a0439e8
no need to gen so many
2015-08-11 10:34:33 +02:00
a1c10a7ec5
clean up
2015-08-11 10:33:44 +02:00
1c40478e6e
SPIN DOGGY SPIN
2015-08-11 10:32:49 +02:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
184c592786
Merge remote-tracking branch 'origin/Bonus' into Bonus
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
2015-08-11 03:12:55 -05:00
13e7e58986
Creeper visual!
2015-08-11 03:09:21 -05:00
c177307f70
Votifier fixes
2015-08-11 02:53:54 -05:00
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
b99c526169
Implementing Carl message.
2015-08-11 09:09:16 +02:00
5d3503b733
Carl rewards
2015-08-11 01:55:27 -05:00
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
d2983b831e
Merge remote-tracking branch 'origin/Bonus' into Bonus
2015-08-11 00:35:44 -06:00
d833385df4
Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes
2015-08-11 00:35:02 -06:00
66f2a5df5e
renamed GAME
2015-08-11 08:32:12 +02:00
b4e8b4f1ac
cant go spinnin while its a countin!
2015-08-11 08:24:28 +02:00
3bedc4ce84
Improving animation timing.
2015-08-11 05:37:58 +02: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
873a2f3c56
Changed slowness from 255 - 2
2015-08-10 19:45:40 -04:00
e81a3f7ecd
Added a method to UtilAlg.
2015-08-10 14:32:49 -04:00
a618b19b73
Small changes
2015-08-10 14:32:35 -04:00
fef269b856
Fixing /e set.
2015-08-10 17:28:27 +02:00
186e3028c2
removing temp fix "there was an error processing your request" for the Spinner.
2015-08-10 17:15:56 +02:00
3be811e480
Fixing Spinner announcements.
2015-08-10 17:08:03 +02:00
ed7b8949bb
Adding SpinnerFiller and SpinnerRewards.
2015-08-10 17:04:47 +02:00
2253a63e96
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 16:43:05 +02:00
c6beb122e3
Adding firework animations for spinner.
2015-08-10 16:42:43 +02:00
ad8781fd84
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 16:14:24 +02:00
Shaun Bennett
Mysticate
Jonathan Williams
fooify
Shaun Bennett
xGamingDudex
AlexTheCoder
Christopher Jozsa
libraryaddict
Sarah
Mini-Chiss
Ty Sayers