Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-28 23:44:58 +02:00
Code Issues Projects Releases Wiki Activity

Allow registering instance extending Instance and not necessary InstanceContainer

Browse Source
This commit is contained in:
themode 2020-09-28 02:29:41 +02:00
parent aea788cd64
commit af9851c334
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -674,7 +674,7 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer {
public void setInstance(Instance instance) { public void setInstance(Instance instance) {
Check.notNull(instance, "instance cannot be null!"); Check.notNull(instance, "instance cannot be null!");
Check.stateCondition(!instance.isRegistered(), Check.stateCondition(!instance.isRegistered(),
"Instances need to be registered with InstanceManager#createInstanceContainer or InstanceManager#createSharedInstance"); "Instances need to be registered with InstanceManager#createInstanceContainer or InstanceManager#registerInstance");
if (this.instance != null) { if (this.instance != null) {
this.instance.removeEntity(this); this.instance.removeEntity(this);

28
src/main/java/net/minestom/server/instance/InstanceManager.java
View File

@ -17,14 +17,17 @@ public final class InstanceManager {
private final Set<Instance> instances = new CopyOnWriteArraySet<>(); private final Set<Instance> instances = new CopyOnWriteArraySet<>();
/** /**
* Register an {@link InstanceContainer} * Register an {@link Instance} internally
* <p>
* Note: not necessary if you created your instance using {@link #createInstanceContainer()} or {@link #createSharedInstance(InstanceContainer)}
* but only if you instantiated your instance object manually
* *
* @param instanceContainer the instance to register * @param instance the {@link Instance} to register
* @return the registered {@link InstanceContainer}
*/ */
public InstanceContainer registerInstanceContainer(InstanceContainer instanceContainer) { public void registerInstance(Instance instance) {
registerInstance(instanceContainer); Check.stateCondition(instance instanceof SharedInstance,
return instanceContainer; "Please use InstanceManager#registerSharedInstance to register a shared instance");
UNSAFE_registerInstance(instance);
} }
/** /**
@ -35,8 +38,9 @@ public final class InstanceManager {
* @return the created {@link InstanceContainer} * @return the created {@link InstanceContainer}
*/ */
public InstanceContainer createInstanceContainer(DimensionType dimensionType, StorageLocation storageLocation) { public InstanceContainer createInstanceContainer(DimensionType dimensionType, StorageLocation storageLocation) {
final InstanceContainer instance = new InstanceContainer(UUID.randomUUID(), dimensionType, storageLocation); final InstanceContainer instanceContainer = new InstanceContainer(UUID.randomUUID(), dimensionType, storageLocation);
return registerInstanceContainer(instance); registerInstance(instanceContainer);
return instanceContainer;
} }
/** /**
@ -82,7 +86,7 @@ public final class InstanceManager {
Check.notNull(instanceContainer, "SharedInstance needs to have an InstanceContainer to be created!"); Check.notNull(instanceContainer, "SharedInstance needs to have an InstanceContainer to be created!");
instanceContainer.addSharedInstance(sharedInstance); instanceContainer.addSharedInstance(sharedInstance);
registerInstance(sharedInstance); UNSAFE_registerInstance(sharedInstance);
return sharedInstance; return sharedInstance;
} }
@ -134,11 +138,13 @@ public final class InstanceManager {
} }
/** /**
* Register the {@link Instance} internally * Register an {@link Instance} internally
* <p>
* Unsafe because it does not check if {@code instance} is a {@link SharedInstance} to verify its container
* *
* @param instance the {@link Instance} to register * @param instance the {@link Instance} to register
*/ */
private void registerInstance(Instance instance) { private void UNSAFE_registerInstance(Instance instance) {
instance.setRegistered(true); instance.setRegistered(true);
this.instances.add(instance); this.instances.add(instance);
} }