Morten
e367391626
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-09-25 18:04:03 +02:00
Morten
1c995b14e8
Ignore this
2015-09-25 18:03:10 +02:00
Morten
59d1a949c4
Created an "END" event for challenges
2015-09-25 17:04:47 +02:00
Christopher Jozsa
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
Shaun Bennett
2b902c5193
Add created by, enabled by, and disabled by to botspam module
2015-09-23 00:25:39 -04:00
Morten
7838ad2bce
For Bisko to pull
2015-09-22 16:12:51 +02:00
Shaun Bennett
3ae043e7d8
Merge remote-tracking branch 'origin/master'
2015-09-22 01:38:52 -04:00
Shaun Bennett
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
Cheese
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
Morten
a5398cb773
Added new challenges and fixed a lot of bugs.
2015-09-19 19:01:13 +02:00
Shaun Bennett
901dad2f8a
Add vote3 to bonusmanager
2015-09-17 22:31:18 -04:00
libraryaddict
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
Sarah
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
Sarah
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
Sarah
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
Sarah
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
Sarah
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
Sarah
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
Sarah
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
Jonathan Williams
1417d31b73
Added 60s delay to timings enable check.
2015-09-11 23:57:26 -07:00
Cheese
c9971bb117
fixed duplicate rank name
2015-09-12 16:45:22 +10:00
Cheese
6216f2ced4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-12 16:33:44 +10:00
Jonathan Williams
a7d4a7534f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-11 22:51:04 -07:00
Jonathan Williams
2380b9041d
Added automatic timings report in the event of lag.
...
Added more exception handling around LoadingWindow
2015-09-11 22:50:53 -07:00
Cheese
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
Cheese
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
Sarah
b56813deef
Improving /e commands (/e kick, /e area, etc)
2015-09-12 04:33:10 +02:00
Cheese
5a79c51506
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-10 13:57:48 +10:00
Cheese
a4cc70c3f0
new small youtuber rank
2015-09-10 13:17:11 +10:00
Morten
6ea9a15e6d
Added a bunch of games
2015-09-07 11:46:08 +02:00
Sarah
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
Sarah
5712af8ddc
Adding Redstone function signs for events.
2015-09-05 20:38:51 +02:00
Jonathan Williams
4bb100b6be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-05 01:53:45 -07:00
Jonathan Williams
4ad95b54cf
Updated ServerMonitor status reporting for network.
2015-09-05 01:53:37 -07:00
Jonathan Williams
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
Cheese
0ac808ba43
stacker pref is now only for pvp stacking.
2015-09-05 10:30:11 +10:00
Cheese
fc5ccd4a5e
fixed 'self scoring' in Soccer
...
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
Cheese
106a7dab2e
removed ability for entities to change blcoks in hub
2015-09-05 09:48:06 +10:00
Jonathan Williams
921292a5c6
Added timings capture and server log copy on server kill inside server monitor.
2015-09-03 09:38:26 -07:00
Jonathan Williams
890c9d59e1
Fixed loading window bug.
...
Added default rank for CoreClient in case of bugged login.
2015-09-03 09:38:02 -07:00
Sarah
503b68da2f
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-08-31 11:32:47 +02:00
Sarah
58ae09ebd4
saving Project for pulling.
2015-08-31 11:32:18 +02:00
Jonathan Williams
c61f9ce3c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-31 00:53:23 -07:00
Jonathan Williams
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
Mini-Chiss
d79794c6d3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-30 15:47:57 -07:00
Mini-Chiss
bb66d47e8e
meow
2015-08-30 15:47:49 -07:00
Ty Sayers
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
Mini-Chiss
519e668d62
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-30 11:01:23 -07:00
Jonathan Williams
47331658ac
Merge remote-tracking branch 'remotes/origin/Myst_EVO'
2015-08-30 00:14:53 -07:00
