Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UnturnedPlayerComponent not being added automatically #11

Merged
merged 5 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ You can still use old RocketMod plugins without any changes/recompilation/update
- [ ] OpenMod.
- [ ] RocketMod Fixes:
- [ ] Fix UnturnedPlayer.SteamProfile (cause so many lags).
- [ ] Fix UnturnedPlayerComponent is not being added automatically.
- [x] Fix UnturnedPlayerComponent is not being added and removed automatically.
- [ ] Assembly Resolve fixes (don't spam with not found library or make a option to disable it, load all libraries at rocketmod start instead of searching for them only on OnAssemblyResolve)
- [ ] Commands fixes:
- [ ] Fix /vanish.
Expand Down
33 changes: 23 additions & 10 deletions Rocket.Unturned/Plugins/PluginUnturnedPlayerComponentManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,51 +17,64 @@ public sealed class PluginUnturnedPlayerComponentManager : MonoBehaviour
{
private Assembly assembly;
private List<Type> unturnedPlayerComponents = new List<Type>();

private void OnDisable()
{
try
{
U.Events.OnPlayerConnected -= addPlayerComponents;
unturnedPlayerComponents = unturnedPlayerComponents.Where(p => p.Assembly != assembly).ToList();
List<Type> playerComponents = RocketHelper.GetTypesFromParentClass(assembly, typeof(UnturnedPlayerComponent));
foreach (Type playerComponent in playerComponents)
for (var i = 0; i < playerComponents.Count; i++)
{
//Provider.Players.ForEach(p => p.Player.gameObject.TryRemoveComponent(playerComponent.GetType()));
var playerComponent = playerComponents[i];
var clients = Provider.clients;
for (var j = 0; j < clients.Count; j++)
{
var steamPlayer = clients[j];
steamPlayer.player.gameObject.TryRemoveComponent(playerComponent.GetType());
}
}
}
catch (Exception ex)
{
Core.Logging.Logger.LogException(ex);
Core.Logging.Logger.LogException(ex, $"An error occured while removing {nameof(UnturnedPlayerComponent)}");
}
}

private void OnEnable()
{
try
{
{
IRocketPlugin plugin = GetComponent<IRocketPlugin>();
assembly = plugin.GetType().Assembly;

U.Events.OnBeforePlayerConnected += addPlayerComponents;
unturnedPlayerComponents.AddRange(RocketHelper.GetTypesFromParentClass(assembly, typeof(UnturnedPlayerComponent)));

foreach (Type playerComponent in unturnedPlayerComponents)
for (var i = 0; i < unturnedPlayerComponents.Count; i++)
{
Core.Logging.Logger.Log("Adding UnturnedPlayerComponent: "+playerComponent.Name);
//Provider.Players.ForEach(p => p.Player.gameObject.TryAddComponent(playerComponent.GetType()));
var playerComponent = unturnedPlayerComponents[i];
Core.Logging.Logger.Log("Adding UnturnedPlayerComponent: " + playerComponent.Name);
var clients = Provider.clients;
for (var j = 0; j < clients.Count; j++)
{
var steamPlayer = clients[j];
steamPlayer.player.gameObject.TryAddComponent(playerComponent.GetType());
}
}
}
catch (Exception ex)
{
Core.Logging.Logger.LogException(ex);
Core.Logging.Logger.LogException(ex, $"An error occured while adding {nameof(UnturnedPlayerComponent)}");
}
}

private void addPlayerComponents(IRocketPlayer p)
{
foreach (Type component in unturnedPlayerComponents)
for (int i = 0; i < unturnedPlayerComponents.Count; i++)
{
var component = unturnedPlayerComponents[i];
((UnturnedPlayer)p).Player.gameObject.AddComponent(component);
}
}
Expand Down
Loading