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

Bad Cayor :P

Browse Source
This commit is contained in:
Olof Larsson 2015-03-05 18:37:29 +01:00
parent e16333b822
commit c83a8b8b11
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/massivecore/MassiveCoreEngineMain.java
View File

@ -394,7 +394,7 @@ public class MassiveCoreEngineMain extends EngineAbstract
// double ms = (double)duration / 1000000D; // double ms = (double)duration / 1000000D;
// String message = Txt.parse("<i>AsyncPlayerPreLoginEvent for %s <i>took <h>%.2f <i>ms.", event.getName(), ms); // String message = Txt.parse("<i>AsyncPlayerPreLoginEvent for %s <i>took <h>%.2f <i>ms.", event.getName(), ms);
// MassiveCore.get().log(message); // MassiveCore.get().log(message);
// NOTE: I get values between 5 and 20 ms. // NOTE: I get values between 5 and 55 ms!
} }
// Can not be cancelled. // Can not be cancelled.

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

@ -674,6 +674,11 @@ public class Coll<E> implements CollInterface<E>
// Otherwise newly attached entities would be removed thinking it was a remote detach. // Otherwise newly attached entities would be removed thinking it was a remote detach.
// Otherwise newly detached entities would be loaded thinking it was a remote attach. // Otherwise newly detached entities would be loaded thinking it was a remote attach.
Modification ret = this.identifiedModifications.get(id); Modification ret = this.identifiedModifications.get(id);
// DEBUG
// if (Bukkit.isPrimaryThread())
// {
// MassiveCore.get().log(Txt.parse("<a>examineId <k>Coll: <v>%s <k>Entity: <v>%s <k>Modification: <v>%s", this.getName(), id, ret));
// }
if (ret == Modification.LOCAL_ATTACH || ret == Modification.LOCAL_DETACH) return ret; if (ret == Modification.LOCAL_ATTACH || ret == Modification.LOCAL_DETACH) return ret;
E localEntity = this.id2entity.get(id); E localEntity = this.id2entity.get(id);
@ -762,7 +767,7 @@ public class Coll<E> implements CollInterface<E>
} }
// DEBUG // DEBUG
// MassiveCore.get().log(Txt.parse("<k>Coll: <v>%s <k>Entity: <v>%s <k>Modification: <v>%s", this.getName(), id, modification)); // MassiveCore.get().log(Txt.parse("<a>syncId <k>Coll: <v>%s <k>Entity: <v>%s <k>Modification: <v>%s", this.getName(), id, modification));
switch (modification) switch (modification)
{ {

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

@ -111,7 +111,12 @@ public abstract class Entity<E extends Entity<E>> implements Comparable<E>
if ( ! coll.inited()) return; if ( ! coll.inited()) return;
coll.identifiedModifications.put(id, Modification.UNKNOWN); // UNKNOWN is very unimportant really.
// LOCAL_ATTACH is for example much more important and should not be replaced.
if ( ! coll.identifiedModifications.containsKey(id))
{
coll.identifiedModifications.put(id, Modification.UNKNOWN);
}
} }
public Modification sync() public Modification sync()