Merge remote-tracking branch 'upstream/master'

Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java

@@ -118,6 +118,10 @@ public final class Prayer {
 		else prayerActiveTicks = 0;
 
 		if(prayerActiveTicks > 0 && prayerActiveTicks % 2 == 0){
+			if(getPlayer().getSkills().getPrayerPoints() == 0){
+				reset();
+				return;
+			}
 			double amountDrain = 0;
 			for(PrayerType type : getActive()){
 				double drain = type.getDrain();
@@ -131,9 +135,6 @@ public final class Prayer {
 			}
 
 			getPlayer().getSkills().decrementPrayerPoints(amountDrain);
-			if(getPlayer().getSkills().getPrayerPoints() == 0){
-				reset();
-			}
 		}
 	}
 

Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java

@@ -108,8 +108,6 @@ public final class SlayerManager {
 		if(hasTask()) {
 			player.getSkills().addExperience(Skills.SLAYER, npc.getSkills().getMaximumLifepoints());
 			decrementAmount(1);
-		}
-
 			if(!hasTask()){
 				flags.setTaskStreak(flags.getTaskStreak() + 1);
 				flags.setCompletedTasks(flags.getCompletedTasks() + 1);
@@ -135,6 +133,7 @@ public final class SlayerManager {
 				//player.sendMessage("You're assigned to kill " + NPCDefinition.forId((player.getSlayer().getTask().getNpcs()[0])).getName().toLowerCase() + "s; Only " + getAmount() + " more to go.");
 			}
 		}
+	}
 
 	/**
 	 * Assigns a task to the manager.

Server/src/main/kotlin/api/ContentAPI.kt

@@ -1230,4 +1230,17 @@ object ContentAPI {
     fun sendNews(message: String){
         Repository.sendNews(message, 12, "CC6600")
     }
+
+    /**
+     * Sends a given Graphics object, or graphics ID, to the given location.
+     * @param gfx the Graphics object, or the Integer ID of the graphics, to send. Either works.
+     * @param location the location to send it to
+     */
+    @JvmStatic
+    fun <G> sendGraphics(gfx: G, location: Location){
+        when(gfx){
+            is Int -> Graphics.send(Graphics(gfx),location)
+            is Graphics -> Graphics.send(gfx, location)
+        }
+    }
 }