AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Safety first!

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2354 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-03-30 19:38:56 +00:00
parent 4c74d96eee
commit 0a5714b661
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/dobj/DObject.java
+4 -4
View File
@@ -1,5 +1,5 @@
// //
// $Id: DObject.java,v 1.60 2003/03/10 18:29:54 mdb Exp $ // $Id: DObject.java,v 1.61 2003/03/30 19:38:56 mdb Exp $
package com.threerings.presents.dobj; package com.threerings.presents.dobj;
@@ -778,7 +778,7 @@ public class DObject implements Streamable
// if we're on the authoritative server, we update the set // if we're on the authoritative server, we update the set
// immediately // immediately
boolean alreadyApplied = false; boolean alreadyApplied = false;
if (_omgr.isManager(this)) { if (_omgr != null && _omgr.isManager(this)) {
// Log.info("Immediately adding [name=" + name + // Log.info("Immediately adding [name=" + name +
// ", entry=" + entry + "]."); // ", entry=" + entry + "].");
set.add(entry); set.add(entry);
@@ -803,7 +803,7 @@ public class DObject implements Streamable
// if we're on the authoritative server, we update the set // if we're on the authoritative server, we update the set
// immediately // immediately
DSet.Entry oldEntry = null; DSet.Entry oldEntry = null;
if (_omgr.isManager(this)) { if (_omgr != null && _omgr.isManager(this)) {
// Log.info("Immediately removing [name=" + name + // Log.info("Immediately removing [name=" + name +
// ", key=" + key + "]."); // ", key=" + key + "].");
oldEntry = set.get(key); oldEntry = set.get(key);
@@ -828,7 +828,7 @@ public class DObject implements Streamable
// if we're on the authoritative server, we update the set // if we're on the authoritative server, we update the set
// immediately // immediately
DSet.Entry oldEntry = null; DSet.Entry oldEntry = null;
if (_omgr.isManager(this)) { if (_omgr != null && _omgr.isManager(this)) {
// Log.info("Immediately updating [name=" + name + // Log.info("Immediately updating [name=" + name +
// ", entry=" + entry + "]."); // ", entry=" + entry + "].");
oldEntry = set.get(entry.getKey()); oldEntry = set.get(entry.getKey());