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

3385 Commits

Author SHA1 Message Date
Jonathan Williams
c1ef96bdcd Fixed jre for staff server 2015-06-26 03:12:00 -05:00
Shaun Bennett
c158a6f89f Merge remote-tracking branch 'origin/master' 2015-06-26 03:10:53 -05:00
Shaun Bennett
3b6a692a2a Ooops 2015-06-26 03:10:44 -05:00
Cheese
1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese
9bf58a2d98 disabled pistons 2015-06-26 17:47:04 +10:00
Cheese
1564a8bc51 disabled hoppers 2015-06-26 17:46:05 +10:00
Cheese
17af562f19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 17:36:25 +10:00
Cheese
59f730ae9d changed sky text and icon to feather 2015-06-26 17:36:12 +10:00
Jonathan Williams
f906f08a18 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:34:36 -05:00
Shaun Bennett
2657ef336a Merge remote-tracking branch 'origin/master' 2015-06-26 02:33:00 -05:00
Shaun Bennett
60901cc17e Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-06-26 02:32:51 -05:00
Cheese
c31d3609bb soup no longer spawns in stacks 2015-06-26 17:32:46 +10:00
Shaun Bennett
7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jonathan Williams
c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese
a5aa2bc0e9 text changes 2015-06-26 17:28:23 +10:00
Cheese
2498f7756c skyawrs stats icon 2015-06-26 17:16:16 +10:00
Cheese
c514cacd5d more skywars fixes 2015-06-26 17:05:29 +10:00
Cheese
015ba53bbe skywars hub text 2015-06-26 16:39:25 +10:00
Cheese
027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Jonathan Williams
efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams
86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Cheese
257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10:00
Cheese
b744320ecc pearl trail fix 2015-06-26 16:08:04 +10:00
Shaun Bennett
1865e41144 Undead Camp 2015-06-26 01:05:36 -05:00
Cheese
caa51d0e89 Merge branch 'SkyWars' 2015-06-26 16:04:46 +10:00
Cheese
16af8453e3 pearl fix 2015-06-26 16:04:07 +10:00
Cheese
338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese
aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese
8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese
0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese
2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify
7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00
Cheese
5710831777 fixed webs dropping webs 2015-06-26 12:34:26 +10:00
Cheese
7d4e36651f less random chests 2015-06-26 12:26:57 +10:00
Cheese
fdbaa4e9c7 dont allow overfill 2015-06-26 12:18:25 +10:00
Cheese
f1da68a82a fixed chickens not spawning 2015-06-26 12:14:35 +10:00
Cheese
00da27a3d6 added middle chests 
added chicken spawns
added zombie/chicken loot
 2015-06-26 12:06:40 +10:00
Cheese
beb78270e5 skywars loot changes 2015-06-26 11:54:35 +10:00
Cheese
bb569a26e2 skywars update 2015-06-26 11:22:33 +10:00
Cheese
b48820a753 ore gen fixed! 2015-06-26 10:50:38 +10:00
Cheese
d9a8d2b6ab ore changes 2015-06-26 10:36:45 +10:00
Jeremiah Bishop
0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
fooify
2679d19a81 Missed a spot. 2015-06-25 08:19:12 -07:00
fooify
ba9e4ba5d9 Fix staff server not hiding in friends list 2015-06-25 08:17:28 -07:00
Cheese
2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese
2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jonathan Williams
526b0dadb6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-25 04:58:26 -05:00
Jonathan Williams
567bb5cd6c Fixed up MotdManager so that old values don't overwrite in the db. 2015-06-25 04:58:16 -05:00
Jonathan Williams
5bdb90b459 Changed disguise perm to YOUTUBE 2015-06-25 04:57:56 -05:00
Shaun Bennett
7f530f6593 New border dimensions 2015-06-24 23:18:18 -05:00
Shaun Bennett
a0d97d5d99 Scoreboard changes, Fix region values, add 1.8 Border for map 2015-06-24 22:44:41 -05:00
Jeremiah Bishop
ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Cheese
b77279a160 fixed notif msg 2015-06-25 11:22:23 +10:00
Jeremiah Bishop
cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
fooify
a36af0acc4 Remove space :) I assume this isn't intended 2015-06-24 10:28:39 -07:00
fooify
ea3c04b8c1 Add fooify to list of AFKers 2015-06-24 10:24:08 -07:00
Shaun Bennett
2735c81205 Fix bug with leaving and joining clans: online player list wouldnt update 2015-06-23 23:00:07 -05:00
Shaun Bennett
fa612c9c86 Chat filter clan names, Fix scoreboard bug 2015-06-23 22:48:51 -05:00
Shaun Bennett
935aba9c16 Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes 2015-06-23 21:45:55 -05:00
Shaun Bennett
e34324b864 Disable auto event now while location and abilities are tweaked 2015-06-23 17:05:47 -05:00
Shaun Bennett
76a1f2b1f0 Reset timer when no players are online 2015-06-23 16:37:49 -05:00
Shaun Bennett
009f8a6764 Merge with twiggy 2015-06-23 16:36:21 -05:00
Jeremiah Bishop
5b4a3249ca Added chest loot and such. 2015-06-22 21:42:45 -04:00
Jeremiah Bishop
7583e4170b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-22 21:40:43 -04:00
Shaun Bennett
50ddd23251 Event auto starting, Terrain Finder, Scoreboard Tweaks, Event idle, other random tweaks 2015-06-22 20:34:13 -05:00
Ty Sayers
1541dc329e Merge branch 'clans/test-server' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
 2015-06-22 16:24:31 -04:00
Ty Sayers
2ffe2badf2 Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans. 2015-06-22 16:20:20 -04:00
Cheese
3a06b54b7f Changed notifications to 50% off sale 2015-06-22 17:10:03 +10:00
Jeremiah Bishop
03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Cheese
648355ac17 mapparser skywars 2015-06-22 11:33:25 +10:00
Jeremiah Bishop
a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Jeremiah Bishop
e12ff7ef7d Fixed? 2015-06-20 22:20:30 -04:00
Jeremiah Bishop
3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00
Aaron Brock
5280433dbd Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:03:53 -04:00
Aaron Brock
3532dea892 Allowed Helper+ to bypass anti-hackusating 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:01:50 -04:00
Jonathan Williams
91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Jonathan Williams
90e13b4b9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-20 03:37:33 -05:00
Jonathan Williams
f92e864c30 Updated motd. 2015-06-20 03:37:22 -05:00
Jonathan Williams
dbde6890a0 Add fallback to load by name if no uuid. 2015-06-20 03:36:55 -05:00
Aaron Brock
8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:36:05 -04:00
Aaron Brock
da981980df Added world.setThundering(false); 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:35:11 -04:00
Aaron Brock
9cedb3b742 Rewrote how hackusations are detected. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:10:26 -04:00
Aaron Brock
1f0accd2a1 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:09:21 -04:00
Cheese
478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
Cheese
77bf332c29 level 25 is uneffected by chat delay 2015-06-20 11:18:31 +10:00
Cheese
2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Aaron Brock
750dddeabc Editing .classpath and a main testing method in UtilBlock 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-19 21:10:10 -04:00
Aaron Brock
61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese
13ae7a19db jr.dev rank up 2015-06-19 18:06:40 +10:00
Cheese
cf152c4897 fixed notifs being sent to people who didnt need them 2015-06-19 13:46:56 +10:00
Cheese
de83e58e75 removed debug 2015-06-19 13:29:32 +10:00
Cheese
8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Aaron Brock
76e4dc6056 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-18 19:50:06 -04:00
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Shaun Bennett
71da87a5ae Some cleanup 2015-06-17 21:36:47 -05:00
Cheese
9a3a014dd5 removed debug! 2015-06-18 12:04:49 +10:00
Shaun Bennett
b5f4574b1b Show region on scoreboard, moving on to event finishes 2015-06-17 20:37:45 -05:00
Aaron Brock
b0ca5ca4aa Freezes the time using doDayLightCycle instead of using a UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:54:28 -04:00
Aaron Brock
41e77b1ade Fixed double-half-slabs (line 68) 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:49:35 -04:00
Shaun Bennett
dbdb2b3fc5 Scoreboards and WorldEvent work 2015-06-17 17:40:16 -05:00
Cheese
6886484d79 Fixed Micro Battles lag (stupid lava) 
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
 2015-06-17 13:02:12 +10:00
Cheese
47744a80e9 jnr dev 2015-06-17 10:44:29 +10:00
Cheese
3014521e79 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-17 10:43:01 +10:00
Cheese
c8843aa2b2 jnr dev rank 2015-06-17 10:42:20 +10:00
Jonathan Williams
0d12a2c12d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-16 12:43:04 -05:00
libraryaddict
b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Jonathan Williams
88328148d1 Modified hardcoded IPs for Bungee player counts. 
Added Jr Dev rank.
 2015-06-15 12:52:59 -05:00
Shaun Bennett
8245b6c466 Schematic generation over time, fixes to gold manager drops 2015-06-14 17:30:02 -05:00
Jonathan Williams
47099a0b20 Changed default redis ip to new us redis. 
Changed previous server to gold text when sending to new server.
 2015-06-12 15:45:54 -05:00
Shaun Bennett
d24f01ba86 More event stuff! 2015-06-11 23:35:29 -05:00
Cheese
a141cec104 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-11 08:57:04 +10:00
Cheese
390ffcab6d bridges support for lillypads map 2015-06-11 08:56:32 +10:00
Shaun Bennett
9cdf69b19d More work on events 2015-06-09 22:58:52 -05:00
Ty Sayers
4dd1cf43de Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop. 2015-06-09 15:46:38 -04:00
Jonathan Williams
f0ce43ca5a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-09 13:22:45 -05:00
Shaun Bennett
a20f41be09 Merge remote-tracking branch 'origin/master' 2015-06-09 13:21:26 -05:00
Shaun Bennett
3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
libraryaddict
37c6593753 Hub: Fix rulebook 2015-06-10 05:27:19 +12:00
libraryaddict
2971761a5e Game stop command: Move unregister of game listener after the gamestate has been changed 2015-06-09 22:19:03 +12:00
Jonathan Williams
c6352445cf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-08 23:18:06 -05:00
Shaun Bennett
d1a7d16810 Fixes GoldManager 2015-06-08 15:04:30 -05:00
Shaun Bennett
6a0584d419 Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
 2015-06-08 15:03:51 -05:00
Shaun Bennett
aa9aba92cd Commit for merge 2015-06-08 14:59:06 -05:00
libraryaddict
1f08c989b5 Minestrike: Enforce resource pack 2015-06-09 03:31:24 +12:00
Shaun Bennett
8c7faf27dd Store gold drop amounts in item metadata (might be worth switching to our own storage?) 2015-06-06 16:04:11 -05:00
Shaun Bennett
ed1c275347 Add Nautilus.Game.PvP to IntelliJ 2015-06-06 15:48:29 -05:00
Shaun Bennett
24a1016836 Slime enrage 2015-06-06 15:39:51 -05:00
Shaun Bennett
6ea000fd22 Remove slimes when server stops 2015-06-06 15:16:03 -05:00
Shaun Bennett
b2bdfe384b Fix IllegalArgumentException with UtilPlayer method 2015-06-06 15:02:16 -05:00
Shaun Bennett
1f92564ea1 Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED] 2015-06-06 14:49:41 -05:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict
fd3232f45d Mineware: Rename old MineWare and move packages 2015-06-06 18:30:47 +12:00
libraryaddict
ef9c69f356 UtilShapes: Fix a method, add a space in OldMineWare in GameType 2015-06-06 18:08:37 +12:00
libraryaddict
5f2810ae37 SurvivalGames: Fix anyone able to start game 2015-06-06 18:07:55 +12:00
Ty Sayers
971612a538 Fix bug relating to Energy Shop purchases and item functionality. Fix bug with GoldManager not being properly initialized on plugin start-up. Add Shops safe-zone to region claims for default clans across world. Create BankShop for all interactions related to economy management, specifically buying & selling GoldTokens as well as converting Gems into Gold on a daily basis. 2015-06-05 19:18:06 -04:00
Cheese
f9b49caeed More gems for bridges/sg kills 
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
 2015-06-05 12:21:20 +10:00
Shaun Bennett
90a7362440 Marge with twiggys code, work on slime splitting 2015-06-04 00:21:09 -05:00
libraryaddict
3a6c030f01 ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something 2015-06-04 16:01:52 +12:00
Ty Sayers
fa3e6c3d1f Fix bug with multiple locations being used for claiming separate areas for server-side clans such as Spawn. 2015-06-03 20:10:32 -04:00
Ty Sayers
e15a2ad123 Add ClansRegions to handle the initialization of default server-side Clans representing special territories such as Spawn and Fields. Additionally, claim land with appropriate distribution according to the respective Clan. Fix bug with WeightSet generation not properly handling low amounts of uniformly likely elements. Fix bug with ClanInfo not properly handling creation of clans and initializing the date created field. Fix bug with Spawn region not properly protecting from claim and PvP settings. 2015-06-03 20:08:34 -04:00
Shaun Bennett
d8acb0aae6 Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-06-02 20:45:53 -05:00
Shaun Bennett
5d431a586a King of the hill work 2015-06-02 20:44:14 -05:00
Ty Sayers
1fa919e954 Finish GoldToken integration for cashing in. Re-implement fixed hidden JSON lore encoding. Fix damage reduction attributes where entity types weren't being properly initialized. Prevent players from breaking blocks in temporary Spawn regions. 2015-06-02 20:01:42 -04:00
libraryaddict
a961e5f0d5 Wizards: Don't gain wands from stats page 2015-06-02 18:49:50 +12:00
libraryaddict
4d8a54e7ba Wizards: Add spellbook on /spec 2015-06-02 18:49:27 +12:00
libraryaddict
bcdb851e21 Teleport: Don't disqualify staff if they are not alive 2015-06-02 18:48:45 +12:00
Ty Sayers
155b078c49 Update spigot version to Shaun's changed. Add separate spawn locations at (200,0) and (-200,0) on the map as well as safe-zone regions surrounding spawns. Temporary halt energy deduction until energy shop is enabled. Fixed issues related to field zones being claimable/breakable, as well as borderlands. Define claimable areas. Add GoldToken item for storing currency into physical items. Add gold management for checking economic status for players. 2015-06-01 15:51:22 -04:00
Ty Sayers
2e19aabfa1 Convert damage system to custom Mineplex damage events to enable legendary abilities. Fix NPE and hanging issue on ServerData's serialization adapter. Finalize item generation logic for instantiating CustomItem's based on specified random distribution of types, attribute counts, etc. Fix several Legendary bugs discovered during testing. Clean left-over template documentation and further clarify ambiguous methods. Add proper updating logic for custom items to track internal stats in hidden json lore. Add safe-logout system to prevent combat logging and enable players to safely log after a designated amount of time. Tweak WindBlade's flight speed to a more natural value. 2015-06-01 12:25:20 -04:00
Shaun Bennett
68b708e32e Schematic Utilities for Clans 2015-05-29 18:23:46 -05:00
libraryaddict
35c005feb8 Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players 2015-05-30 10:30:30 +12:00