diff --git a/.idea_module/narya.iml b/.idea_module/narya.iml
deleted file mode 100644
index b2b423f47..000000000
--- a/.idea_module/narya.iml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/as-pom.xml b/as-pom.xml
index 9ee335b7f..648ae659a 100644
--- a/as-pom.xml
+++ b/as-pom.xml
@@ -4,7 +4,7 @@
com.threerings
naryalib
swc
- 1.4-SNAPSHOT
+ 1.3-SNAPSHOT
narya
Facilities for making networked multiplayer games.
http://code.google.com/p/narya/
diff --git a/narya.iml b/narya.iml
index b2f058cfe..d32ec0a31 100644
--- a/narya.iml
+++ b/narya.iml
@@ -1,19 +1,19 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -42,23 +42,30 @@
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -67,35 +74,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -111,6 +118,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java b/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
index de879335c..5c4b33b0c 100644
--- a/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
+++ b/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
@@ -103,7 +103,7 @@ public class SpeakHandler
// ensure that the speaker is valid
if ((mode == ChatCodes.BROADCAST_MODE) ||
- (_validator != null && !_validator.isValidSpeaker(_speakObj, source, mode))) {
+ (_validator != null && !_validator.isValidSpeaker(_speakObj, caller, mode))) {
log.warning("Refusing invalid speak request", "caller", caller.who(),
"speakObj", _speakObj.which(), "message", message, "mode", mode);
diff --git a/src/main/java/com/threerings/crowd/data/CrowdPermissionPolicy.java b/src/main/java/com/threerings/crowd/data/CrowdPermissionPolicy.java
index 10d43f49e..42527eef8 100644
--- a/src/main/java/com/threerings/crowd/data/CrowdPermissionPolicy.java
+++ b/src/main/java/com/threerings/crowd/data/CrowdPermissionPolicy.java
@@ -21,30 +21,25 @@
package com.threerings.crowd.data;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.Permission;
import com.threerings.presents.data.PermissionPolicy;
import com.threerings.crowd.chat.data.ChatCodes;
-import com.threerings.crowd.server.BodyLocator;
/**
* Implements some Crowd permissions.
*/
-@Singleton
public class CrowdPermissionPolicy extends PermissionPolicy
{
@Override // from PermissionPolicy
public String checkAccess (ClientObject clobj, Permission perm, Object context)
{
- BodyObject body = _locator.forClient(clobj);
- if (body == null) {
+ if (!(clobj instanceof BodyObject)) {
return super.checkAccess(clobj, perm, context);
}
+ BodyObject body = (BodyObject)clobj;
if (perm == ChatCodes.BROADCAST_ACCESS) {
return body.getTokens().isAdmin() ? null : ACCESS_DENIED;
} else if (perm == ChatCodes.CHAT_ACCESS) {
@@ -53,6 +48,4 @@ public class CrowdPermissionPolicy extends PermissionPolicy
return super.checkAccess(clobj, perm, context);
}
}
-
- @Inject protected transient BodyLocator _locator;
}
diff --git a/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java b/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
index af8449de2..1a087a904 100644
--- a/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
+++ b/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
@@ -21,10 +21,6 @@
package com.threerings.crowd.server;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.PermissionPolicy;
import com.threerings.presents.server.ClientLocal;
@@ -36,7 +32,6 @@ import com.threerings.crowd.data.CrowdPermissionPolicy;
/**
* Used to configure crowd-specific client object data.
*/
-@Singleton
public class CrowdClientResolver extends ClientResolver
{
@Override // from ClientResolver
@@ -54,8 +49,6 @@ public class CrowdClientResolver extends ClientResolver
@Override // from ClientResolver
public PermissionPolicy createPermissionPolicy ()
{
- return _injector.getInstance(CrowdPermissionPolicy.class);
+ return new CrowdPermissionPolicy();
}
-
- @Inject protected Injector _injector;
}