Commit Graph

812 Commits

Author SHA1 Message Date
Jonathan Williams
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
Shaun Bennett
cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
libraryaddict
5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
Cheese
4184fe20cf minor fixes 2015-09-12 14:09:04 +10: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
Mysticate
ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Jonathan Williams
bbe5b79c7e Disabled AntiHack create table.
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
Mini-Chiss
14bf8faf3a disabled big sale 2015-08-18 09:49:53 +02:00
Shaun Bennett
8ab8388344 Merge remote-tracking branch 'origin/master' 2015-08-17 05:05:36 -05:00
Shaun Bennett
dc8bec340e Rename Quick game menu for consistency 2015-08-17 03:18:35 -05:00
Mini-Chiss
7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
Mini-Chiss
91ce9cfba7 fixed a crash with fireworks 2015-08-16 08:39:03 +02:00
Mini-Chiss
5fa9135b08 renamed soccer to slimeball :) 2015-08-13 14:11:22 +02:00
Mini-Chiss
534c91c706 remove items from inside soccer 2015-08-13 13:24:55 +02:00
Jonathan Williams
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
Mini-Chiss
fcfb2559b8 players cannot grab slime :O 2015-08-12 14:41:33 +02:00
Mini-Chiss
d1302e8dc3 fixed full msg 2015-08-12 12:42:59 +02:00
Mini-Chiss
5293e24469 fixed text 2015-08-12 11:58:40 +02:00
Mini-Chiss
cd5c7e7110 fixed kb 2015-08-12 11:23:19 +02:00
Mini-Chiss
f19efb4a93 renamed football to soccer 2015-08-12 09:23:00 +02:00
Mini-Chiss
7cda53cb28 carl spinner in arcade/
tutorial fixes
2015-08-12 08:36:21 +02:00
fooify
07bdbdde46 minor grammar issue 2015-08-11 09:55:10 -07:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Shaun Bennett
fe153bee11 Fix revert issues 2015-08-11 03:19:27 -05:00
Mysticate
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
Mini-Chiss
65b51a137c new party tute room 2015-08-10 14:50:44 +02:00
Mini-Chiss
bd2c9aa5e6 hub stuff 2015-08-10 14:00:02 +02:00
Shaun Bennett
8745884153 Various fixes 2015-08-10 04:51:11 -05:00
Shaun Bennett
b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
Shaun Bennett
6f8d6f8a40 Move Bonus and Poll to core 2015-08-10 01:55:50 -05:00
Shaun Bennett
a0be3fa964 Use atomic mysql operations for modifying tickets 2015-08-10 01:19:10 -05:00
Shaun Bennett
511cc76bef Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working) 2015-08-10 00:47:36 -05:00
Shaun Bennett
28806aaf0a Update Bonus amounts, Attempting to fix Votifier plugin for EU/US 2015-08-10 00:33:54 -05:00
Shaun Bennett
d20fe54010 Disable carl features when carl can't be found 2015-08-09 16:36:48 -05:00
Mini-Chiss
c2d066a576 ui fixes 2015-08-09 19:31:24 +02:00
Mini-Chiss
41dcc564c9 polish polish polish
MAKE IT SHINE!
2015-08-09 19:02:07 +02:00
Sarah
8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss
5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Sarah
941e746ca9 Finalizing Poll GUI in Carl's GUI. 2015-08-09 16:47:03 +02:00
Sarah
85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +02:00
Shaun Bennett
e6519206af Add event to be called when a player tries to buy a carl spin 2015-08-08 16:29:03 -05:00
Mini-Chiss
cbb0cb96c8 ensured white 2015-08-08 13:54:35 +02:00
Mini-Chiss
e030331565 fixed some bugs 2015-08-08 13:51:37 +02:00
Mini-Chiss
fa7f19bde5 removed debug 2015-08-08 13:47:30 +02:00
Mini-Chiss
328c31de88 hub Update
fixed bad gameid
2015-08-08 13:47:09 +02:00
Shaun Bennett
4f6dfdb856 Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes 2015-08-08 06:35:25 -05:00
Mini-Chiss
eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00