Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • ds/Rocket.Unturned
1 result
Select Git revision
Loading items
Show changes

Commits on Source 7

Show whitespace changes
Inline Side-by-side
Showing
with 157 additions and 134 deletions
CHANGELOG.md
View file @ b23524dd
......@@ -2,6 +2,16 @@
All notable changes should be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## 4.9.3.17 - 2024-07-03
### Fixed
- V command expecting `VehicleAsset` throwing an exception when encountering `VehicleRedirectorAsset`. Thanks @ItsRodrigoAl in issue #75.
## 4.9.3.16 - 2023-10-13
### Changed
- Bind Unturned's `PreVanillaAssemblyResolvePostRedirects` event to fix assembly resolve consistency.
## 4.9.3.15 - 2023-02-08
### Fixed
......
Rocket.Unturned/Commands/CommandV.cs
View file @ b23524dd
......@@ -66,9 +66,9 @@ namespace Rocket.Unturned.Commands
}
Asset[] assets = SDG.Unturned.Assets.find(EAssetType.VEHICLE);
foreach (VehicleAsset ia in assets)
foreach (Asset ia in assets)
{
if (ia != null && ia.vehicleName != null && ia.vehicleName.ToLower().Contains(itemString.ToLower()))
if (ia != null && ia.FriendlyName != null && ia.FriendlyName.ToLower().Contains(itemString.ToLower()))
{
id = ia.id;
break;
......@@ -82,7 +82,7 @@ namespace Rocket.Unturned.Commands
}
Asset a = SDG.Unturned.Assets.find(EAssetType.VEHICLE, id.Value);
string assetName = ((VehicleAsset)a).vehicleName;
string assetName = a.FriendlyName; // Nelson 2024-07-03: Didn't previously check for null either.
if(U.Settings.Instance.EnableVehicleBlacklist && !player.HasPermission("vehicleblacklist.bypass"))
{
......
Rocket.Unturned/Properties/AssemblyInfo.cs
View file @ b23524dd
......@@ -6,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Rocket.Unturned")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: Guid("8870d132-f877-4fbd-9e73-49c8b1af8b3f")]
[assembly: AssemblyVersion("4.9.3.15")]
\ No newline at end of file
[assembly: AssemblyVersion("4.9.3.17")]
\ No newline at end of file
Rocket.Unturned/Rocket.Unturned.csproj
View file @ b23524dd
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rocket.Unturned</RootNamespace>
<AssemblyName>Rocket.Unturned</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
......@@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -30,6 +31,7 @@
<OutputPath>bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == '|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -37,6 +39,7 @@
<OutputPath>bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Local|AnyCPU'">
<OutputPath>..\..\..\..\..\Desktop\unturned\Modules\Rocket.Unturned\</OutputPath>
......@@ -49,6 +52,7 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<DebugSymbols>true</DebugSymbols>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
......
Rocket.Unturned/Rocket.Unturned/Rocket.Unturned.module
View file @ b23524dd
{
"Name": "Rocket.Unturned",
"Version": "4.9.3.15",
"Version": "4.9.3.16",
"Assemblies":
[
{
......
Rocket.Unturned/lib/Assembly-CSharp.dll
View file @ b23524dd
No preview for this file type
Rocket/Rocket.API/Properties/AssemblyInfo.cs
View file @ b23524dd
......@@ -6,4 +6,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Rocket.API")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: Guid("8870d132-f877-4fbd-9e73-49c8b1af8b3f")]
[assembly: AssemblyVersion("4.9.3.14")]
\ No newline at end of file
[assembly: AssemblyVersion("4.9.3.16")]
\ No newline at end of file
Rocket/Rocket.API/Rocket.API.csproj
View file @ b23524dd
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rocket.API</RootNamespace>
<AssemblyName>Rocket.API</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
......@@ -46,6 +46,7 @@
<Optimize>False</Optimize>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<DebugSymbols>true</DebugSymbols>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
......
Rocket/Rocket.Core.Tests/Rocket.Core.Tests.csproj
View file @ b23524dd
......@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rocket.Core.Tests</RootNamespace>
<AssemblyName>Rocket.Core.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
......@@ -28,6 +28,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -37,6 +38,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
......
Rocket/Rocket.Core/Commands/RocketCommandManager.cs
View file @ b23524dd
......@@ -164,7 +164,7 @@ namespace Rocket.Core.Commands
public void DeregisterFromAssembly(Assembly assembly)
{
commands.RemoveAll(rc => rc.Command.GetType().Assembly == assembly);
commands.RemoveAll(rc => getCommandType(rc.Command).Assembly == assembly);
}
public double GetCooldown(IRocketPlayer player, IRocketCommand command)
......
Rocket/Rocket.Core/Plugins/RocketPluginManager.cs
View file @ b23524dd
......@@ -39,8 +39,7 @@ namespace Rocket.Core.Plugins
return plugins.Select(g => g.GetComponent<IRocketPlugin>()).Where(p => p != null && ((IRocketPlugin)p).Name == name).FirstOrDefault();
}
private void Awake() {
AppDomain.CurrentDomain.AssemblyResolve += delegate (object sender, ResolveEventArgs args)
private Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
{
try
{
......@@ -58,7 +57,11 @@ namespace Rocket.Core.Plugins
Logging.Logger.LogError("Could not find dependency: " + args.Name);
return null;
};
}
private void Awake() {
AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
SDG.Framework.Modules.ModuleHook.PreVanillaAssemblyResolvePostRedirects += OnAssemblyResolve;
}
private void Start()
......
Rocket/Rocket.Core/Properties/AssemblyInfo.cs
View file @ b23524dd
......@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Rocket.Core")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: Guid("8870d132-f877-4fbd-9e73-49c8b1af8b3f")]
[assembly: AssemblyVersion("4.9.3.14")]
[assembly: AssemblyVersion("4.9.3.16")]
[assembly: InternalsVisibleTo("Rocket.Core.Tests")]
[assembly: InternalsVisibleTo("Rocket.Core.Explorables")]
Rocket/Rocket.Core/Rocket.Core.csproj
View file @ b23524dd
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rocket.Core</RootNamespace>
<AssemblyName>Rocket.Core</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
......@@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
......@@ -30,6 +31,7 @@
<OutputPath>bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Local|AnyCPU'">
<OutputPath>..\..\..\..\..\Desktop\Unturned\Modules\Rocket.Unturned\</OutputPath>
......@@ -44,6 +46,7 @@
</DocumentationFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<DebugSymbols>true</DebugSymbols>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Rocket.Core.nuspec</ApplicationManifest>
......