JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,215 Commits 1 Branch 0 Tags 481 MiB
4b4f43ac16
Commit Graph

1189 Commits

Author SHA1 Message Date
CoderTim
bea6eabb95 Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages 2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9 Changes to Sneaky Assassin power-ups, including addition of compass power-up. 2014-08-06 01:23:06 -04:00
Chiss
9e047847c2 scoreboard fix 2014-08-06 12:42:07 +10:00
Chiss
4108a02f50 Sneaky scoreboard order 2014-08-06 12:37:41 +10:00
Chiss
a0010668c6 Sneaky Assassins changes 2014-08-06 12:23:02 +10:00
Chiss
f09506e436 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
 2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e Parser Fixes 
Sneaky Stuff
 2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-05 01:23:37 -04:00
CoderTim
0240d50029 Sneaky Assassins Changes: 
- when you get a kill, give an armor upgrade and 1 smoke bomb
 - Revealer range increased to 12 blocks
 - NPC dies once every 2 seconds
 - Lose 1 hunger every second. Gain 8 when damaging player or NPC
 - Reveal all players every 60 seconds, for 2 seconds
 - Added cloaking back to smoke bomb
 - Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
 - NPC speed slightly decreased
 - Corrected sword power-up progression
 2014-08-05 01:23:24 -04:00
Ty
2e43d565bd Resolve merge conflicts. 2014-08-04 19:14:04 -04:00
Ty
1b7c762942 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-04 18:47:49 -04:00
Shaun Bennett
e8d14e9fbf Remove created by comment 2014-08-04 00:33:34 -05:00
Shaun Bennett
1c5b3919e1 Merge remote-tracking branch 'origin/master' 2014-08-04 00:31:56 -05:00
Shaun Bennett
0edb0d74a7 Fix bugs with kit sorting + cost of kits 2014-08-04 00:31:46 -05:00
CoderTim
e7d3cf9e02 Sneaky Assassins previous commit bug fix 2014-08-04 01:06:11 -04:00
CoderTim
012382ec48 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 01:02:27 -04:00
CoderTim
8a727e1365 Smarter Sneaky Assassins AI 2014-08-04 01:02:05 -04:00
Shaun Bennett
e4662ab563 Update my SneakyAssassinKit change to work with Tim's changes 2014-08-03 23:41:54 -05:00
Shaun Bennett
34dfe8dacd Merge remote-tracking branch 'origin/master' 2014-08-03 23:32:37 -05:00
Shaun Bennett
fe32cf5444 Remove KitAvailability.Blue 2014-08-03 23:31:55 -05:00
CoderTim
39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim
482f48f994 Prevent players in Sneaky Assassins from breaking paintings and item frames 2014-08-04 00:00:04 -04:00
CoderTim
ec48a59301 Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as. 2014-08-03 23:59:10 -04:00
Shaun Bennett
35b16e026c Blue kits cost gems instead of being premium kits 2014-08-03 22:44:01 -05:00
Jonathan Williams
7408afa697 Reverted Free/Premium split in Server Monitor. 2014-08-03 20:01:37 -07:00
Shaun Bennett
6d7e8072d5 Remove premium server restriction in ServerCommand 2014-08-03 13:41:14 -05:00
Shaun Bennett
69b709b3ab Change clock timer to be 35 seconds 2014-08-03 13:28:56 -05:00
Shaun Bennett
69aa881ba2 Remove reference to server split in clock text 2014-08-03 13:27:04 -05:00
Shaun Bennett
db61a10c7f Remove server split from server selection pages 
Select any server with portals
 2014-08-03 13:24:13 -05:00
Jonathan Williams
cb1a466a5b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-02 03:01:53 -07:00
Jonathan Williams
51faf5cd15 Reduced free timer. 2014-08-02 03:01:36 -07:00
Ty
6a9255e97b Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes. 2014-08-01 17:56:29 -04:00
Shaun Bennett
5d1ab654b9 Merge remote-tracking branch 'origin/master' 2014-08-01 03:57:57 -05:00
Shaun Bennett
232088cd55 Make sure servers are in progress before counting them 2014-08-01 03:57:34 -05:00
Jonathan Williams
874c1413a3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-01 00:46:34 -07:00
Jonathan Williams
f2d1380478 Fixed bug with Server monitor. 2014-08-01 00:46:00 -07:00
Chiss
fb1f4ed5ac Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-01 17:45:35 +10:00
Chiss
07fe476fd3 fix for stuff that jon broke 2014-08-01 17:45:22 +10:00
Jonathan Williams
b056733ba1 Removed duration code and replaced with 60000L 2014-08-01 00:09:35 -07:00
Jonathan Williams
53ce70488f Merge pull request #1 from premium-server-menu to master 
* commit '95a45409a98c141a115e463e56e440b204ae2029':
  Use UtilPlayer and F.main for messaging
  Fix flashing clock (oops!)
  Sound effects and knockbacks!
  Flashing wool instead of clock for the timer
  Change duration of timer. Don't punish a party if the leader has ultra
  Lighten load on our servers, not free servers!
  Lore edit on clock item
  Place players on correct server corresponding to their rank via portals
  Visual clock update
  Fix lore messages not displaying correctly under certain circumstances
  Use constants for lore messages on server page
  Prevent free players from joining servers before time limit
  Deny joining Premium servers through server command without premium
  Fix "Click to Spectate" formatting
  Identify free servers from server name
  Add Server Menu for Premium Servers. Item lore still needs some work
 2014-08-01 02:05:39 -05:00
Jonathan Williams
a608783580 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-01 00:03:42 -07:00
Chiss
b6fe33e6fb Ultra/hero gems removed 2014-08-01 17:03:07 +10:00
Shaun Bennett
95a45409a9 Use UtilPlayer and F.main for messaging 2014-08-01 01:43:50 -05:00
Jonathan Williams
46fb27afbb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-31 23:39:08 -07:00
Jonathan Williams
eae4bed630 Removed unused ServerManagerUpdater.java 
Tweaked ServerMonitor to handle Free/Premium
 2014-07-31 23:37:39 -07:00
Shaun Bennett
15d48d2867 Fix flashing clock (oops!) 2014-08-01 01:25:11 -05:00
Shaun Bennett
fbe6ab2fdb Sound effects and knockbacks! 2014-08-01 01:22:01 -05:00
Shaun Bennett
fd01b4933b Flashing wool instead of clock for the timer 2014-08-01 00:39:38 -05:00
Shaun Bennett
6b18fdf396 Change duration of timer. Don't punish a party if the leader has ultra 2014-08-01 00:38:26 -05:00
Shaun Bennett
ccf5893051 Lighten load on our servers, not free servers! 2014-08-01 00:04:12 -05:00
Shaun Bennett
5ea6eaeb9e Lore edit on clock item 2014-08-01 00:03:26 -05:00
Shaun Bennett
c01e9abf29 Place players on correct server corresponding to their rank via portals 2014-07-31 23:56:51 -05:00
Shaun Bennett
7d1da7114f Visual clock update 2014-07-31 23:49:52 -05:00
Chiss
0f9e72d623 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-01 14:06:13 +10:00
Chiss
599a6eb1f7 Changed kit availability to be based on free/premium. 2014-08-01 14:05:53 +10:00
CoderTim
c36242cc47 Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily. 
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
 2014-07-31 23:35:50 -04:00
CoderTim
6ac00cde99 Move Sneaky Assassins NPCs during Prepare and Live 2014-07-31 23:32:26 -04:00
CoderTim
22748eb225 Updated KitRevealer description 2014-07-31 23:31:42 -04:00
Shaun Bennett
cf724272dd Fix lore messages not displaying correctly under certain circumstances 2014-07-31 17:30:02 -05:00
Shaun Bennett
41128cbc9d Use constants for lore messages on server page 2014-07-31 17:17:05 -05:00
Shaun Bennett
4c74ce60eb Prevent free players from joining servers before time limit 2014-07-31 15:36:00 -05:00
Shaun Bennett
c2b1f2a52f Deny joining Premium servers through server command without premium 2014-07-31 13:47:51 -05:00
CoderTim
77b6f0250e Play zombie_unfect sound when PerkRevealer explodes 
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
 2014-07-30 23:56:40 -04:00
Chiss
308c2e1b91 Kit availability 2014-07-31 13:00:05 +10:00
Chiss
a4d579789c Sneaky Assassins changes :) 2014-07-31 12:58:33 +10:00
Peter Miller
fb0469adfa Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak. 2014-07-30 20:09:58 -04:00
Shaun Bennett
b93d6b9cb1 Fix "Click to Spectate" formatting 2014-07-30 17:44:09 -05:00
Shaun Bennett
3e9aebdb87 Identify free servers from server name 2014-07-30 17:30:46 -05:00
Shaun Bennett
dcc8eaaa21 Add Server Menu for Premium Servers. Item lore still needs some work 2014-07-30 17:19:51 -05:00
Jonathan Williams
4d397438be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 21:11:15 -07:00
Jonathan Williams
f235f67aa5 Added +20 player buffer for lobbies. 2014-07-29 21:11:07 -07:00
Jonathan Williams
ff5bc3f485 Added file logger to ServerMonitor. 
Fixed Statifier pulling inactive bungee records.
 2014-07-29 21:10:52 -07:00
Jonathan Williams
9c952a7b04 Cleaned up date format creation every call in LobbyBalancer 
Reduced times to call per second.
 2014-07-29 21:10:08 -07:00
Jonathan Williams
d129f722a3 Cleaned up Firework util. 2014-07-29 21:09:16 -07:00
CoderTim
0382afecd8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 20:24:04 -04:00
CoderTim
fa91bf0a00 Disable dropping hunger in Sneaky Assassins 2014-07-29 20:22:46 -04:00
Jonathan Williams
46cc2576dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-26 10:41:04 -07:00
Jonathan Williams
4e1a05e9bd Fixed whitelist issue with tournament mode. 2014-07-26 10:40:49 -07:00
Chiss
78b3d3b35c restored original bridge timer :) 2014-07-26 21:05:12 +10:00
Chiss
3f4e4b6607 fixed -1 not working 2014-07-26 21:03:50 +10:00
Chiss
802415be8f -1 team kills for suicide (only after bridge drop) 2014-07-26 20:57:40 +10:00
Chiss
f090ed9313 end game fixes 2014-07-26 20:53:48 +10:00
Chiss
4f46ccc8aa Winner is decided on bridge tourney timeout 2014-07-26 20:29:01 +10:00
Chiss
fa73ab5335 Bridges Tourney stuff 2014-07-26 17:40:17 +10:00
Chiss
21314afabe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-26 17:03:30 +10:00
Chiss
107388baa3 Added game flag to allow clicking in inventory during games 2014-07-26 17:03:03 +10:00
Jonathan Williams
a455042c07 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-25 23:38:38 -07:00
Jonathan Williams
12b42cad29 Made tournament changes: 
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
 2014-07-25 23:38:21 -07:00
Jonathan Williams
d6e06f4556 Removed some unnecessary logic in Lobby Balancer 
REmoved unused code in mineplexer.
 2014-07-25 23:37:24 -07:00
CoderTim
c747638303 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-25 18:33:34 -04:00
CoderTim
fe46355130 Added missing description to Sneak Assassin revealer items 2014-07-24 21:25:59 -04:00
CoderTim
fe356add41 Restore original blocks when Sneaky Assassin power-up beacon is removed 2014-07-23 15:45:30 -04:00
Peter Miller
d7037f1619 Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase. 2014-07-22 22:18:29 -04:00
Peter Miller
e8d4ab2517 Re-enabled News commands after adding check to "Reset newsIndex if outside of bounds of news array after RefreshNews but before UtilTime.elapsed" in NewsManager.java 2014-07-21 18:06:33 -04:00
CoderTim
a6a274069c Prevent power-up message spam when player is fully powered-up 2014-07-21 17:26:45 -04:00
CoderTim
4460f2e651 Prevent fully powered-up Sneaky Assassin players from using additional power-ups 2014-07-21 16:29:15 -04:00
Jonathan Williams
5bc7549b8c Disabled news because of console errors. 2014-07-19 14:48:05 -07:00
Jonathan Williams
fc43f434f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-19 13:56:30 -07:00
Jonathan Williams
1362deca59 More work on FriendManager 2014-07-19 13:56:21 -07:00
Jonathan Williams
2ae3d89496 Fixed issue with RepositoryBase and Friend/MysqlRepo 
Each db call on login gets its own async after the first two account calls are finished.
 2014-07-19 13:56:03 -07:00
Jonathan Williams
de5c0a77ef Added another requirement for Lobbies in ServerMonitor 1500 available slots 2014-07-19 13:54:27 -07:00
Jonathan Williams
e6818c4c46 Added small tweaks to lobby balancer and sorter for better spread on connect. 2014-07-19 13:54:03 -07:00
Jonathan Williams
8b747a81e1 Fixed filter bypass 2014-07-19 13:53:14 -07:00
CoderTim
d2038670d6 Merge remote-tracking branch 'origin/master' 2014-07-18 02:52:26 -04:00
CoderTim
efa74f509a Fixed bug where revealer doesn't always work 
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
 2014-07-18 02:48:06 -04:00
Peter Miller
944e7fca40 Finalizing BONUS clickable text hover text and News Entry issue overall. 
Fixing bug with "/news set" command with insufficient command arguments.
 2014-07-16 18:49:49 -04:00
Peter Miller
d9110b4e3b Implementing BONUS: Clickable Chat Links. 2014-07-15 22:31:53 -04:00
Jonathan Williams
3636255e8a Fixed bug with DisguiseManager undisguising players. 
Temp fix for emeralds not triggering in Perk Revealer.
 2014-07-14 23:48:34 -07:00
Jonathan Williams
cb4d436605 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-14 22:58:58 -07:00
Jonathan Williams
1207ed8199 Added DDOSProtectionSwitcher email functionality 
mineplex.core.Server cleanup.

Refactored RepositoryBase.

Implemented core functionality of Friends
 2014-07-14 22:58:36 -07:00
CoderTim
64feaf63ed Implemented Sneaky Assassin Revealer kit 2014-07-15 00:36:38 -04:00
CoderTim
c547801b7b Added Sneaky Assassin NPC movement 2014-07-11 22:55:48 -04:00
CoderTim
b15534e1b2 Some work on Sneak Assassins NPCs 
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
 2014-07-11 00:56:25 -04:00
Peter Miller
2ec8371f98 Implementing /news add and delete commands. 2014-07-10 21:10:35 -04:00
Peter Miller
82ba7bf30f Implementing /news list and set commands. 2014-07-09 20:38:11 -04:00
Jonathan Williams
65b2e14689 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-09 11:15:06 -07:00
Jonathan Williams
193bd82b61 Minor adjustment to rule book. 2014-07-09 11:14:57 -07:00
Peter Miller
f38af4ab8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 22:56:02 -04:00
Peter Miller
58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Mini-Chiss
5cd6bcfc82 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-08 18:08:46 -07:00
Mini-Chiss
03c56535ef MAPDATA 2014-07-08 18:08:37 -07:00
Jonathan Williams
97422e237f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 18:01:30 -07:00
Jonathan Williams
74817f5f2e Added rule book to Hub. 
Fixed mineplexer bungee internet status.

Fixed up ddosprotectionswitcher.
 2014-07-08 18:01:03 -07:00
Mini-Chiss
bd6b9b8888 so many fix 2014-07-08 17:35:27 -07:00
Mini-Chiss
c5e05523d3 sneakyfix 2014-07-08 17:34:47 -07:00
Mini-Chiss
dd0040086d Parser Permissions 
Sneaky Assasssin thingy.
 2014-07-08 17:33:22 -07:00
Mini-Chiss
4d40df45d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-08 15:14:02 -07:00
Mini-Chiss
1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams
fb5f92df2a Finalized internet status for bungees 2014-07-08 15:04:59 -07:00
Jonathan Williams
2e5b003cff More work on internet status stuff. 
Fixed some buggies with parser.
 2014-07-08 13:18:27 -07:00
Jonathan Williams
2ccb27065c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 12:44:26 -07:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Mini-Chiss
848f843fbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/WorldManager.java
 2014-07-08 12:41:25 -07:00
Mini-Chiss
22709b0cd8 merge 2014-07-08 12:40:28 -07:00
Jonathan Williams
39b2ad57be Fix for map parser zipping. 2014-07-08 12:37:39 -07:00
Jonathan Williams
6ae35f1b37 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 12:20:28 -07:00
Jonathan Williams
e6e86c2042 Updated DnsMadeEasy api. 
Cleaned up some bungee code.

Added InternetStatus to Bungees.

Fixed some portal stuff.
 2014-07-08 12:20:19 -07:00
Mini-Chiss
65e7e1e0b3 Parser 2014-07-08 12:18:43 -07:00
Mini-Chiss
cf25bdc44f Bridges fix being able to break mid chests before gamestart 
Map parser Updates
 2014-07-07 19:04:44 -07:00
Jonathan Williams
082cf98e99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-07 16:26:08 -07:00
Jonathan Williams
64903ae4b4 Work on DDoS Protection switcher 2014-07-07 16:25:49 -07:00
Mini-Chiss
ef86fe6948 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-07 16:24:43 -07:00
Mini-Chiss
62f6ea815d Champs Balance Update 
Map Parser Update
 2014-07-07 16:23:55 -07:00
CoderTim
3490db4b6f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-07 19:10:40 -04:00
CoderTim
38e4240a61 Fully implemented Sneaky Assassins Power-Ups 2014-07-07 19:10:29 -04:00
Peter Miller
ddf1a8ff74 Pointed "send" command to "AddTransferRecord" method in Portal module. 
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
 2014-07-07 17:30:03 -04:00
CoderTim
fe1bf95342 Fixed code style and updated IntelliJ code style settings 2014-07-07 14:45:02 -04:00
Jonathan Williams
a66e877028 Cleaned up Bungee mineplexer a bit. 
Refactored send/server commands for Portal.
 2014-07-05 10:56:20 -07:00
Jonathan Williams
ff8c506690 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 23:23:30 -07:00
Jonathan Williams
c882ab1b34 Fixed portal command stuff. 
Removed temp code from PlayerTracker

Added temp project for future ddos prot switching.
 2014-07-04 23:23:19 -07:00