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

4791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ty Sayers
5cdf31d0e6 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-28 12:52:12 -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
libraryaddict
249ecdd381 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-28 11:42:53 -07:00
libraryaddict
1f5cd624a4 Fix up iron golem, add slam attack 2015-08-28 11:42:33 -07:00
Mysticate
571d992dbe Fixed a few bugs. 2015-08-27 20:47:55 -06:00
Ty Sayers
8b105a0b22 Merge pull request #46 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit '268cced9f2ff058485c70d611dc46d2159750b47':
  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 17:48:12 -05:00
Ty Sayers
268cced9f2 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 15:47:26 -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
Ty Sayers
2e4c27cb11 Merge pull request #45 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit '4ddc82f8204e322373b54c50308dc6bdb29f59b3':
  Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class
 2015-08-27 16:56:41 -05:00
Ty Sayers
ff13f51151 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:55:33 -07:00
Ty Sayers
4ddc82f820 Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class 2015-08-27 14:54:56 -07:00
Shaun Bennett
4f2d861b21 Fix chat bug, enable TablistFix for clans 2015-08-27 14:53:52 -07:00
Ty Sayers
4567496978 Merge pull request #44 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit '783f526b76266cf4b947ff6b6530c73b2e1c2366':
  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 16:44:03 -05: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
libraryaddict
379ee9271a Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta 
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
  Iron Wizard, fixed iron golem custom name
  Push golem block shot as per request
 2015-08-27 16:34:46 -05:00
Shaun Bennett
e86bca99fd Clans Chat 2015-08-27 14:33:50 -07:00
libraryaddict
9d3f125c9e Iron Wizard, fixed iron golem custom name 2015-08-27 14:18:10 -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
libraryaddict
102fcd8e73 Push golem block shot as per request 2015-08-27 11:10:17 -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
Mysticate
f2f6afb6ca Fixes :D 2015-08-26 20:10:58 -06:00
Shaun Bennett
a5400b0fef Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-26 18:35:20 -07:00
Ty Sayers
6442ec4c2a Merge pull request #42 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit 'c20d2c9516a04927b45686f301e0ea75050549e6':
  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.
  Left-over commit from last update to add new /region-reset command.
  Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.
  Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.
  Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.
 2015-08-26 19:38:58 -05: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
Mysticate
a351a8f1ed Minor improvements. 2015-08-26 13:47:01 -06: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
12d479391e Merge pull request #41 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit '52911b953433814afb0dee0fb320431d6d102489':
  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 14:25:53 -05: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
Mysticate
cfdb0dfa4f Added kits + achievements. Hurrah! 2015-08-26 13:19:17 -06:00
Mysticate
988382375f Started adding kits 2015-08-25 23:36:18 -06:00
Shaun Bennett
062328313e Fix errors 2015-08-24 22:24:26 -05:00
Jonathan Williams
61c80fd31d Fixed issue with player login sessions. 2015-08-24 20:21:14 -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
Jonathan Williams
b64a75cbf3 Added maintenance message. 2015-08-24 18:35:11 -07: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