Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor DB changes

Browse Source
This commit is contained in:
Magnus Ulf 2019-02-17 11:10:12 +01:00
parent d0b9af0324
commit 17321f7249
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/massivecraft/massivecore/store/Coll.java
View File

@ -344,7 +344,6 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
// Then attach! // Then attach!
this.attach(entity, id, false); this.attach(entity, id, false);
// On creation it might be modified by addition or removal of new/old fields. // On creation it might be modified by addition or removal of new/old fields.
// So we must do a check for that. // So we must do a check for that.
// this.putIdentifiedModificationFixed(id, Modification.UNKNOWN); // this.putIdentifiedModificationFixed(id, Modification.UNKNOWN);

7
src/com/massivecraft/massivecore/store/EntityContainerAbstract.java
View File

@ -244,8 +244,8 @@ public abstract class EntityContainerAbstract<E extends EntityInternal<E>> imple
protected synchronized String attach(E entity, Object oid, boolean noteModification) protected synchronized String attach(E entity, Object oid, boolean noteModification)
{ {
// Check entity // Check entity
if (entity == null) return null; if (entity == null) throw new NullPointerException("entity");
if (entity.attached()) return entity.getId(); if (entity.attached()) throw new IllegalArgumentException("already attached");
String id; String id;
// Check/Fix id // Check/Fix id
@ -259,7 +259,7 @@ public abstract class EntityContainerAbstract<E extends EntityInternal<E>> imple
if (id == null) return null; if (id == null) return null;
if (this.getIdToEntity().containsKey(id)) return null; if (this.getIdToEntity().containsKey(id)) return null;
} }
// PRE // PRE
this.preAttach(entity, id); this.preAttach(entity, id);
@ -269,7 +269,6 @@ public abstract class EntityContainerAbstract<E extends EntityInternal<E>> imple
// Attach // Attach
this.getIdToEntityRaw().put(id, entity); this.getIdToEntityRaw().put(id, entity);
// Identify Modification // Identify Modification
if (noteModification) if (noteModification)
{ {