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

4150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shaun Bennett
062328313e Fix errors 2015-08-24 22:24:26 -05: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
libraryaddict
ba41118da7 Load boss battles properly 2015-08-25 01:58:57 +12:00
libraryaddict
8798244351 Bosses stuff 2015-08-24 08:34:29 +12: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
libraryaddict
81f793d693 Iron Wizard: Commit progress 2015-08-14 20:49:17 +12:00
libraryaddict
a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
libraryaddict
7fb85f24d1 UtilEnt: Change CreatureLook to support LivingEntity, not just Creature 2015-08-14 19:15:35 +12:00
libraryaddict
33a6e4cb13 UtilEnt: Add CreatureLook method 2015-08-14 19:12:05 +12:00
Jonathan Williams
a2d7aa77fe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-14 00:37:55 -05:00
Jonathan Williams
f5d934fe53 Fixed sync db calls for pets. 
Make sure to add/remove pets in mysql.
 2015-08-14 00:37:43 -05:00
Mini-Chiss
80588a308b balanaced brawler 2015-08-13 21:03:48 +02:00
Mini-Chiss
7157aaee2b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 20:56:20 +02:00
Mini-Chiss
a1ba2cffac fixed needler not doing posion 2015-08-13 20:56:02 +02:00
Shaun Bennett
0b4dbab871 Change ticket command access to admin 2015-08-13 11:23:29 -05:00
Shaun Bennett
bd7317cf7b Fix ticket command rollback >:D 2015-08-13 11:03:12 -05:00
Mini-Chiss
5fa9135b08 renamed soccer to slimeball :) 2015-08-13 14:11:22 +02:00
Mini-Chiss
6ef3215516 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 13:25:41 +02:00
Mini-Chiss
534c91c706 remove items from inside soccer 2015-08-13 13:24:55 +02:00
Shaun Bennett
bc8aff31cb Merge remote-tracking branch 'origin/master' 2015-08-13 06:12:24 -05:00
Shaun Bennett
af15476f19 Use login query to handle logins 2015-08-13 06:12:11 -05:00
Mini-Chiss
878ac82ade fixed error! 2015-08-13 13:01:41 +02:00
Mini-Chiss
1487692609 completely disabled team armor in arcade. avoids typing it just as game starts. 2015-08-13 12:57:30 +02:00
Mini-Chiss
fc1a8e4e25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 12:52:11 +02:00
Mini-Chiss
f3b58fe9b6 disabled team armor command in games D: 2015-08-13 12:51:57 +02:00
Shaun Bennett
e1d04354fb Use dummy record for AddPlayer 2015-08-13 05:18:53 -05:00
Shaun Bennett
94c00cdb72 Adding some comments 2015-08-13 04:05:28 -05:00
Shaun Bennett
4d6e827739 Remove vote3! 2015-08-13 04:03:03 -05:00
Shaun Bennett
92c0e1452b Add vote3 2015-08-13 04:01:53 -05:00
Shaun Bennett
0c68321e81 Global button 2015-08-13 03:58:05 -05:00
Shaun Bennett
11a4805c38 Stat stuff! 2015-08-13 03:54:23 -05:00
Shaun Bennett
4aac057956 Merge remote-tracking branch 'origin/master' 2015-08-13 03:32:40 -05:00