From 6735cf6029de09bb568630f5d84e14959e8d1039 Mon Sep 17 00:00:00 2001
From: Laszlo Paillat <laszlo.paillat@gmail.com>
Date: Mon, 18 Oct 2021 18:08:05 +0200
Subject: [PATCH] added IEntityContainer.World property

---
 source/DefaultEcs/EntityMap.cs        | 10 ++++------
 source/DefaultEcs/EntityMultiMap.cs   | 10 ++++------
 source/DefaultEcs/EntitySet.cs        | 10 ++++------
 source/DefaultEcs/EntitySortedSet.cs  | 10 ++++------
 source/DefaultEcs/IEntityContainer.cs |  5 +++++
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/source/DefaultEcs/EntityMap.cs b/source/DefaultEcs/EntityMap.cs
index 12579a5e..a968ccf5 100644
--- a/source/DefaultEcs/EntityMap.cs
+++ b/source/DefaultEcs/EntityMap.cs
@@ -113,12 +113,6 @@ internal KeyEnumerator(EntityMap<TKey> map)
 
         #region Properties
 
-        /// <summary>
-        /// Gets the <see cref="DefaultEcs.World"/> instance from which current <see cref="EntityMap{TKey}"/> originate.
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        public World World => World.Worlds[_worldId];
-
         /// <summary>
         /// Gets the keys contained in the <see cref="EntityMap{TKey}"/>.
         /// </summary>
@@ -206,6 +200,10 @@ private void On(in ComponentChangedMessage<TKey> message)
 
         #region IEntityContainer
 
+        /// <inheritdoc/>
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public World World => World.Worlds[_worldId];
+
         /// <inheritdoc/>
         public event EntityAddedHandler EntityAdded;
 
diff --git a/source/DefaultEcs/EntityMultiMap.cs b/source/DefaultEcs/EntityMultiMap.cs
index 4aff4730..d82e3a74 100644
--- a/source/DefaultEcs/EntityMultiMap.cs
+++ b/source/DefaultEcs/EntityMultiMap.cs
@@ -221,12 +221,6 @@ public bool MoveNext()
 
         #region Properties
 
-        /// <summary>
-        /// Gets the <see cref="DefaultEcs.World"/> instance from which current <see cref="EntityMultiMap{TKey}"/> originate.
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        public World World => World.Worlds[_worldId];
-
         /// <summary>
         /// Gets the keys contained in the <see cref="EntityMultiMap{TKey}"/>.
         /// </summary>
@@ -350,6 +344,10 @@ public bool TryGetEntities(TKey key, out ReadOnlySpan<Entity> entities)
 
         #region IEntityContainer
 
+        /// <inheritdoc/>
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public World World => World.Worlds[_worldId];
+
         /// <inheritdoc/>
         public event EntityAddedHandler EntityAdded;
 
diff --git a/source/DefaultEcs/EntitySet.cs b/source/DefaultEcs/EntitySet.cs
index 2e1abe30..5dccf15a 100644
--- a/source/DefaultEcs/EntitySet.cs
+++ b/source/DefaultEcs/EntitySet.cs
@@ -32,12 +32,6 @@ public sealed class EntitySet : IEntityContainer, ISortable
 
         #region Properties
 
-        /// <summary>
-        /// Gets the <see cref="DefaultEcs.World"/> instance from which current <see cref="EntitySet"/> originate.
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        public World World => World.Worlds[_worldId];
-
         /// <summary>
         /// Gets the number of <see cref="Entity"/> in the current <see cref="EntitySet"/>.
         /// </summary>
@@ -104,6 +98,10 @@ internal EntitySet(
 
         #region IEntityContainer
 
+        /// <inheritdoc/>
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public World World => World.Worlds[_worldId];
+
         /// <inheritdoc/>
         public event EntityAddedHandler EntityAdded;
 
diff --git a/source/DefaultEcs/EntitySortedSet.cs b/source/DefaultEcs/EntitySortedSet.cs
index 487298b7..042d5c97 100644
--- a/source/DefaultEcs/EntitySortedSet.cs
+++ b/source/DefaultEcs/EntitySortedSet.cs
@@ -33,12 +33,6 @@ public sealed class EntitySortedSet<TComponent> : IEntityContainer
 
         #region Properties
 
-        /// <summary>
-        /// Gets the <see cref="DefaultEcs.World"/> instance from which current <see cref="EntitySortedSet{T}"/> originate.
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        public World World => World.Worlds[_worldId];
-
         /// <summary>
         /// Gets the number of <see cref="Entity"/> in the current <see cref="EntitySortedSet{T}"/>.
         /// </summary>
@@ -120,6 +114,10 @@ private void On(in ComponentChangedMessage<TComponent> message)
 
         #region IEntityContainer
 
+        /// <inheritdoc/>
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public World World => World.Worlds[_worldId];
+
         /// <inheritdoc/>
         public event EntityAddedHandler EntityAdded;
 
diff --git a/source/DefaultEcs/IEntityContainer.cs b/source/DefaultEcs/IEntityContainer.cs
index 0946f940..d8cc50ff 100644
--- a/source/DefaultEcs/IEntityContainer.cs
+++ b/source/DefaultEcs/IEntityContainer.cs
@@ -4,6 +4,11 @@ namespace DefaultEcs
 {
     internal interface IEntityContainer : Internal.IEntityContainer, IDisposable
     {
+        /// <summary>
+        /// Gets the <see cref="DefaultEcs.World"/> instance from which current <see cref="IEntityContainer"/> originate.
+        /// </summary>
+        World World { get; }
+
         /// <summary>
         /// Occurs when an <see cref="Entity"/> is added in the current <see cref="IEntityContainer"/>.
         /// </summary>