fishfixes

src/server/components/gatherer.js

@@ -145,6 +145,7 @@ define([
 			}
 
 			gatherResult.items.forEach(function(i) {
+				delete i.pos;
 				this.obj.inventory.getItem(i);
 			}, this);
 
@@ -226,6 +227,7 @@ define([
 				}, this);
 
 				this.obj.syncer.set(true, 'gatherer', 'progress', 100);
+				this.obj.syncer.set(false, 'gatherer', 'progress', 100);
 
 				if (this.gathering.resourceNode.nodeType == 'fish')
 					this.obj.syncer.set(true, 'gatherer', 'action', 'Fishing');

src/server/config/maps/tutorial/events/fishingTournament.js

@@ -28,7 +28,13 @@ module.exports = {
 	}],
 
 	duration: 4285,
-	prizeTime: 342,
+	prizeTime: 3428,
+
+	events: {
+		afterGiveRewards: function(events) {
+			events.setEventDescription('Fishing Tournament', 'The tournament has ended.');
+		}
+	},
 
 	helpers: {
 		updateRewards: function(event, anglerNayla) {
@@ -136,7 +142,7 @@ module.exports = {
 
 	phases: [{
 		type: 'spawnMob',
-		endMark: 1,
+		endMark: 1714,
 		mobs: {
 			name: 'Angler Nayla',
 			attackable: false,

src/server/events/events.js

@@ -119,6 +119,9 @@ define([
 
 				mail.sendMail(p.name, rList);
 			}, this);
+
+			if ((config.events) && (config.events.afterGiveRewards))
+				config.events.afterGiveRewards(this);
 		},
 
 		stopEvent: function(config) {

src/server/world/resourceSpawner.js

@@ -144,7 +144,7 @@ define([
 				type: node.type,
 				sprite: node.blueprint.itemSprite,
 				name: node.blueprint.name,
-				quantity: 1,
+				quantity: (blueprint.type != 'fish') ? 1 : null,
 				quality: 0
 			};