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

243 Commits

Author SHA1 Message Date
Shaun Bennett
c27fdf023c Fix login manager and stats manager 2015-08-29 17:18:14 -07:00
Shaun Bennett
820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
Ty Sayers
227a077dba Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
 2015-08-29 15:53:42 -07:00
Shaun Bennett
5db4a55dda Enable clans login manager 2015-08-29 15:41:37 -07:00
Shaun Bennett
16b317a877 Forgot to remove debug code 2015-08-29 15:17:03 -07:00
Shaun Bennett
4aee4f8fd7 Fix generators 2015-08-29 15:09:02 -07:00
Ty Sayers
aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Shaun Bennett
8f1da698d2 TNT generator storage in mysql (needs testing still) 2015-08-29 14:37:35 -07:00
Shaun Bennett
62cf58bd55 Fix a bug where claiming a new land would display that land as neutral 2015-08-29 13:56:26 -07:00
Shaun Bennett
fae27df496 Add ClansLoginManager, TNT Generators (Still needs persistence) 2015-08-29 13:35:31 -07:00
Jonathan Williams
6f0309622c Removed AccountCache. 
Converted that to PlayerCache and store account id in there.
 2015-08-28 20:58:58 -07:00
Shaun Bennett
676817601a Prevent players from logging into the wrong clans server 2015-08-28 17:31:09 -07:00
Ty Sayers
35c79804ac Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-28 14:17:22 -07:00
Ty Sayers
825dd66283 Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones. 2015-08-28 14:17:11 -07:00
Shaun Bennett
c51a449df3 Enable caching for clans, update craftbukkit jar 2015-08-28 13:10:30 -07:00
Shaun Bennett
6f39c072a4 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-28 12:57:13 -07:00
Ty Sayers
b98cde8b80 Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed. 2015-08-28 12:52:02 -07:00
Shaun Bennett
cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -07:00
Ty Sayers
6a330a66d9 Fix bug with Building shop materials not properly being purchased in bulk. Modify the notification message for combat tagged players in safezones to display on the middle of the screen instead of chat. 2015-08-27 15:46:57 -07:00
Shaun Bennett
4f2d861b21 Fix chat bug, enable TablistFix for clans 2015-08-27 14:53:52 -07:00
Ty Sayers
783f526b76 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:42:41 -07:00
Ty Sayers
4dcd54a9b0 Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans. 2015-08-27 14:42:07 -07:00
Shaun Bennett
e86bca99fd Clans Chat 2015-08-27 14:33:50 -07:00
Shaun Bennett
b0ee2bb669 Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items 2015-08-27 13:57:57 -07:00
Shaun Bennett
adfc451e9f You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift 2015-08-27 09:33:44 -07:00
Shaun Bennett
a5400b0fef Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-26 18:35:20 -07:00
Ty Sayers
c20d2c9516 Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands. 2015-08-26 17:37:31 -07:00
Shaun Bennett
669de4c91d Change EntitySpawnEvent to CreatureSpawnEvent 2015-08-26 16:44:39 -07:00
Shaun Bennett
e4c48e5f3f Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 2015-08-26 15:01:44 -07:00
Shaun Bennett
e85682d68f Use proper item names for recipes, don't allow repairing items more than two times 2015-08-26 14:56:28 -07:00
Ty Sayers
62ffdc1ef1 Left-over commit from last update to add new /region-reset command. 2015-08-26 14:54:33 -07:00
Ty Sayers
3b999d2660 Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields. 2015-08-26 14:54:15 -07:00
Shaun Bennett
0dd79419eb Update schematic files 2015-08-26 13:39:13 -07:00
Shaun Bennett
e6c4227a4f Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 2015-08-26 13:30:02 -07:00
Ty Sayers
fc5f57803e Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map. 2015-08-26 13:29:22 -07:00
Ty Sayers
c3013063de Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans. 2015-08-26 13:09:10 -07:00
Shaun Bennett
14f5cb4704 Allow breaking/placing blocks when in creative 2015-08-26 13:09:01 -07:00
Shaun Bennett
7a66a8dad9 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-26 12:26:35 -07:00
Shaun Bennett
b13c9fe227 Field updates, War updates, bug fixes 2015-08-26 12:26:27 -07:00
Ty Sayers
52911b9534 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-26 12:24:02 -07:00
Ty Sayers
9a45d1116a Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones. 2015-08-26 12:22:36 -07:00
Shaun Bennett
bf1f62057c Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-08-24 22:15:08 -05:00
Shaun Bennett
6841cbac69 Clans bug fixes + shop updates 2015-08-24 22:03:26 -05:00
Ty Sayers
69afefd66f Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java

Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
 2015-08-24 20:55:29 -04:00
Ty Sayers
a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
Ty Sayers
6c9a99fa1b Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning. 2015-08-22 15:06:05 -04:00
libraryaddict
39ede2064a Bosses game progress 2015-08-21 16:12:26 +12:00
libraryaddict
1e14d29999 Clans: Migrate bosses to combat core, fix map to rotate its cursor, finished golem? 2015-08-17 21:04:26 +12:00
Mini-Chiss
7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
libraryaddict
81f793d693 Iron Wizard: Commit progress 2015-08-14 20:49:17 +12:00
Shaun Bennett
2305e8bbaa Store Kills, Deaths, Murders, Wins, Losses in database 
Add Murder
 2015-07-29 01:48:49 -05:00
Ty Sayers
13f47ad903 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
 2015-07-24 13:59:01 -05:00
Ty Sayers
0b49d053fe Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events. 2015-07-20 15:57:57 -05:00
libraryaddict
cd55eba2be Clans: Fix map inventory moving 2015-07-21 07:37:08 +12:00
Jonathan Williams
0772f2e91e Fixes for GoldManager 2015-07-19 21:04:59 -07:00
Jonathan Williams
3b47b01aea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-07-19 20:18:08 -07:00
Jonathan Williams
73aea85876 GoldManager now uses stored procedure. 
Deductions automatically process gold queue and return if transaction succeeded.
 2015-07-19 19:32:46 -07:00
Jonathan Williams
3660b348cd Work on Gold. 2015-07-19 18:15:50 -07:00
Shaun Bennett
1ef6fe3ed6 Observer changes 2015-07-17 15:37:33 -05:00
libraryaddict
3dcf489ea6 Add 'clan' to the clans command 2015-07-17 17:12:44 +12:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
libraryaddict
c79117f86a Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 2015-07-17 00:30:54 +12:00
libraryaddict
aaee5f01ce Clans: Modifications to map stuff, fix food level depleting too fast 2015-07-17 00:30:34 +12:00
Jonathan Williams
9cf4ff005a Added some debug checks. 2015-07-16 01:26:38 -05:00
Shaun Bennett
6a598690b0 Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix 2015-07-15 21:43:35 -05:00
Shaun Bennett
7f98157890 More work/fixes 2015-07-14 20:38:30 -05:00
Shaun Bennett
ae71de30db Fixes and changes 2015-07-14 01:57:53 -05:00
Shaun Bennett
5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05:00
Shaun Bennett
231d4bd494 Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events 2015-07-13 20:23:51 -05:00
Shaun Bennett
dc1fe5fc2c Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager 2015-07-13 19:11:17 -05:00
libraryaddict
66bef4ac00 Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans 2015-07-13 21:21:17 +12:00
Shaun Bennett
a9e68ff777 Completed Energy 2015-07-08 21:39:31 -05:00
libraryaddict
27c7e7be03 Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 2015-07-04 09:07:29 +12:00
libraryaddict
fbf2935b19 Don't display dead players 2015-07-04 09:07:14 +12:00
Shaun Bennett
384d1814d7 Scoreboard teams display clan relationships 2015-07-03 15:12:46 -05:00
libraryaddict
c021c6cc19 Added missing but not forgotten MapCommand 2015-07-04 07:12:50 +12:00
libraryaddict
24294237ea Add /map command 2015-07-04 04:11:35 +12:00
libraryaddict
89a4541275 If inventory is empty, add clans map 2015-07-04 04:09:18 +12:00
libraryaddict
c75f22b5e0 Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-07-04 03:44:59 +12:00
libraryaddict
68f7bd533d Clans Map stuff 2015-07-03 14:23:37 +12:00
Shaun Bennett
9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00
Shaun Bennett
0fce46f504 Finished Undead Camp Event (Loot tables still need adjusting) 2015-06-30 15:28:50 -05:00
Shaun Bennett
0fdc4e0008 Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java
 2015-06-30 14:04:35 -05:00
Shaun Bennett
be974bfaac Work from laptop 2015-06-30 14:02:39 -05:00
Shaun Bennett
e0284e2eb0 Loot for World Events 2015-06-29 22:32:40 -05:00
Ty Sayers
d2f633f572 Fix attribute name positioning bug as well as duplicated attributes on randomly generated items. Fix misleading description of item attributes Conquering/Protection. Fix bug with unwanted entities spawning and targetting players in safe Spawn zones. Fix bug with WindBlade occasionally killing users via fall damage after a long flight even though close to the ground. Fix bug with MagneticBlade not properly pulling entities other than players. Fix bug with AlligatorsTooth not properly granting certain effects such as water breathing. 2015-06-29 16:38:51 -04:00
Shaun Bennett
d07c319581 Saving some work 2015-06-27 22:22:02 -05:00
Shaun Bennett
1865e41144 Undead Camp 2015-06-26 01:05:36 -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
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
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
Jeremiah Bishop
03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00