JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-04-25 00:44:27 -07:00
parent 9136fa0b15 8229925fca
commit a37ace7576
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
View File

@ -33,10 +33,10 @@ public class NewsManager extends MiniPlugin
_news = new String[]
{
"New SSM Kit: " + C.cYellow + C.Bold + "Skeletal Horse",
"New Game: " + C.cYellow + C.Bold + "Sheep Quest",
"Beta Servers Live! " + C.cPurple + C.Bold + "ULTRA ONLY",
"Beta Game: " + C.cYellow + C.Bold + "Gravity",
"Champions Update: " + C.cYellow + C.Bold + "Skill Levels",
"Champions Update: " + C.cGreen + C.Bold + "More Customisation",
"Champions Update: " + C.cYellow + C.Bold + "Item Selection",
"Champions Update: " + C.cGreen + C.Bold + "More Balanced",
};
}

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SilencingArrow.java
View File

@ -138,6 +138,8 @@ public class SilencingArrow extends SkillActive
//Damage
event.AddMod(damager.getName(), GetName(), 0, true);
_arrows.remove(projectile);
}
@EventHandler

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/dominate_data/CapturePoint.java
View File

@ -113,7 +113,7 @@ public class CapturePoint
if (!_captured)
return;
Host.AddScore(_owner, 4);
Host.AddScore(_owner, 6);
}
private void CaptureUpdate()