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

244 Commits

Author SHA1 Message Date
cnr e7da161f35 Revert "Fixed PC-706" 
This reverts commit 96d16be5b7.
 2016-07-20 20:07:06 -05:00
cnr 917b83250d Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing" 
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
 2016-07-14 00:10:37 -05:00
AlexTheCoder 30287a0832 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing 2016-07-11 14:46:08 -04:00
xGamingDudex b8650d741d Fixed PC-707 
Fixed arrows damaging the shooter.
Fixed all instances of arrows bouncing of targets.
 2016-07-08 16:48:17 -05:00
xGamingDudex 96d16be5b7 Fixed PC-706 
Tweaked settings to reasonable values in local testing.
 2016-07-08 16:48:11 -05:00
Alex-The-Coder e8a1c9bcba Add damage check to the Enchantment Handler... 
...to avoid performing calculations where it is not necessary
 2016-07-08 07:42:00 -04:00
samczsun 63b6158fe4 More UHC Fixes 
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks

Fancy spectating

Use enum priorities
 2016-07-06 15:55:12 -04:00
AlexTheCoder eccd7deedc Fix merge errors and properly force disable particles by checking the game's settings 2016-07-05 17:25:01 -04:00
AlexTheCoder b0303a8870 Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder 9c4b787436 Make protection enchantments actually protect wearer from damage (Fixes PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder 36bb0b9ae8 Force player visibility to refresh in games over a steady rate (Fixes PC-497) 2016-06-30 17:41:09 -05:00
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
samczsun 2e1bb25b0b
Fix exceptions 2016-06-22 21:12:24 -04:00
LCastr0 cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
Ben 1778bd4c28 Final little tweaks to Champions 2016-06-04 18:28:38 +01:00
samczsun 9af2c7e9f4
Restore hunger after Hold. Fixes PC-334 2016-05-24 15:38:18 -04:00
samczsun 516ad5a640 Check cancellation before continuing Takedown. Fixes PC-277 2016-05-24 13:15:29 -04:00
samczsun 41846f835d Bump listener priority, change wording. Fixes PC-308 2016-05-24 13:15:29 -04:00
xGamingDudex 17a4517e71 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
 2016-05-05 21:03:15 +02:00
Ben e139bea465 Fix kill messages inserting a space below them in chat. 2016-05-01 23:03:18 +01:00
xGamingDudex b7099088a9 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
 2016-04-23 00:55:48 +02:00
AlexTheCoder 70541fd6f2 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-22 05:41:24 -04:00
Jonathan Williams 477acf044e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-22 04:34:21 -05:00
cnr ef8474ae9d Set default CustomExplosion maxFallingBlocks to 0 
This fixes an exception thrown when the trap rune in Wizards is
activated.
 2016-04-19 02:59:31 -05:00
AlexTheCoder d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
Jonathan Williams 019cfe41cc Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-15 12:40:54 -05:00
AlexTheCoder 33b557eb10 - Huuuuuuuge amount of changes for chiss 2016-04-14 22:45:21 -04:00
Ben b313bc5308 Make undead chests not show the 'you are not permitted to use ender chest' messages. 2016-04-10 16:52:54 +01:00
Jonathan Williams 8b42de03cb Debug messages for PoisonShock 2016-04-06 10:39:00 -05:00
Jonathan Williams dd5b2d5e3f Fixed NPE with poison condition effect. 2016-04-05 00:36:18 -05:00
phobia 5ad877f864 So many fixes <3 2016-04-04 12:47:23 +10:00
Ben 0f22c4359d PC-19 - Remove World Event messages for players in Tutorial 2016-03-31 00:02:51 +01:00
libraryaddict 8b1b63c8b3 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Patches/craftbukkit.jar
 2016-02-18 16:45:37 +13:00
xGamingDudex 7645af8933 Should have fixed falling block explosions sometimes throwing exceptions 2016-02-16 17:41:16 +01:00
AlexTheCoder f6c38903f2 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-13 14:34:11 -05:00
AlexTheCoder 197bcc9dbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
 2016-02-12 21:23:58 -05:00
Cheese 690c2acce8 many valentine, such wow 2016-02-05 13:25:57 +11:00
Shaun Bennett 50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
AlexTheCoder b84ec01597 - Huge amount of stuff 2016-01-26 22:52:45 -05:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00
Shaun Bennett ea315a1447 Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop 
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
 2016-01-20 10:19:09 -05:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
md_5 4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
NewGarbo d3452772ed outposts work (grr git is weird trying to switch over to clans/beta) 2016-01-12 07:02:03 +00:00
libraryaddict c3e11e87ea Fix small issues with burning and ignition 2016-01-12 19:10:32 +13:00
libraryaddict 11da5a3fe1 Fix fire combusting and cancelled damage events 2016-01-12 18:56:48 +13:00
libraryaddict 92c4450eea Update the dual version 2015-12-30 21:12:11 +13:00
Mysticate d16dd4a9d2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:35:55 -05:00
Mysticate b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05:00
Shaun Bennett 607c164753 Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop 2015-12-15 13:55:01 -05:00