Merge branch 'general-devel' into patch-17

CHANGELOG.md

@@ -14,6 +14,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Added LandGolfBallInCup event which is accessible for developers to work with, as well as LandGolfBallInCup handler to handle exploits where players could send direct packets to trigger and imitate golf ball cup landing anywhere in the game world. Added two public lists in Handlers.LandGolfBallInCupHandler: GolfBallProjectileIDs and GolfClubItemIDs. (@Patrikkk)
 * Added SyncTilePicking event. This is called when a player damages a tile. Implementing SyncTilePickingHandler and patching tile damaging related exploits. (Preventing player sending invalid world position data which disconnects other players.)
 * Fixed the issue where mobs could not be fished out during bloodmoon because of Bouncer checks. (@Patrikkk)
+	*Fixed the issue where certain fishing rods could not fish out NPCs due to a Bouncer check. (@Patrikkk)
 * Update for OTAPI 2.0.0.37 and Terraria 1.4.0.5. (@hakusaro, @Patrikkk)
 * Adding missing PlayerInfo data in GetDataHandler. (@Patrikkk)
 

TShockAPI/Bouncer.cs

@@ -1906,8 +1906,8 @@ namespace TShockAPI
 		/// <param name="args"></param>
 		internal void OnFishOutNPC(object sender, GetDataHandlers.FishOutNPCEventArgs args)
 		{
-			/// Getting recent projectiles of the player which are named Bobber. All bobbers have the same Name.
-			var projectile = args.Player.RecentlyCreatedProjectiles.FirstOrDefault(p => Main.projectile[p.Index].Name == "Bobber");
+			/// Getting recent projectiles of the player and selecting the first that is a bobber.
+			var projectile = args.Player.RecentlyCreatedProjectiles.FirstOrDefault(p => Main.projectile[p.Index].bobber);
 
 			if (!FishingRodItemIDs.Contains(args.Player.SelectedItem.type))
 			{

TShockAPI/DB/GroupManager.cs

@@ -76,7 +76,8 @@ namespace TShockAPI.DB
 						Permissions.summonboss,
 						Permissions.whisper,
 						Permissions.wormhole,
-						Permissions.canpaint));
+						Permissions.canpaint,
+                                              Permissions.pylon));
 
 				AddDefaultGroup("vip", "default",
 					string.Join(",",
@@ -123,7 +124,8 @@ namespace TShockAPI.DB
 						Permissions.tpnpc,
 						Permissions.tppos,
 						Permissions.tpsilent,
-						Permissions.userinfo));
+						Permissions.userinfo,
+                                              Permissions.spawn));
 
 				AddDefaultGroup("trustedadmin", "admin",
 					string.Join(",",
@@ -155,7 +157,20 @@ namespace TShockAPI.DB
 						Permissions.invade,
 						Permissions.startdd2,
 						Permissions.uploaddata,
-						Permissions.uploadothersdata));
+						Permissions.uploadothersdata,
+                                              Permissions.journey_timefreeze,
+						Permissions.journey_timeset,
+						Permissions.journey_timespeed,
+						Permissions.journey_godmode,
+						Permissions.journey_windstrength,
+						Permissions.journey_windfreeze,
+						Permissions.journey_rainstrength,
+						Permissions.journey_rainfreeze,
+						Permissions.journey_placementrange,
+						Permissions.journey_setdifficulty,
+						Permissions.journey_biomespreadfreeze,
+						Permissions.journey_setspawnrate,
+                                              Permissions.journey_contributeresearch));
 
 				AddDefaultGroup("owner", "trustedadmin",
 					string.Join(",",
@@ -174,19 +189,7 @@ namespace TShockAPI.DB
 						Permissions.settempgroup,
 						Permissions.spawnrate,
 						Permissions.tpoverride,
-						Permissions.createdumps,
-						Permissions.journey_timefreeze,
-						Permissions.journey_timeset,
-						Permissions.journey_timespeed,
-						Permissions.journey_godmode,
-						Permissions.journey_windstrength,
-						Permissions.journey_windfreeze,
-						Permissions.journey_rainstrength,
-						Permissions.journey_rainfreeze,
-						Permissions.journey_placementrange,
-						Permissions.journey_setdifficulty,
-						Permissions.journey_biomespreadfreeze,
-						Permissions.journey_setspawnrate));
+						Permissions.createdumps));
 			}
 
 			// Load Permissions from the DB