Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

Commit

Permalink
sponge: Update for API changes
Browse files Browse the repository at this point in the history
  • Loading branch information
zml2008 committed Sep 4, 2015
1 parent fbf0da5 commit f391d02
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
Expand Up @@ -42,8 +42,7 @@
import org.spongepowered.api.GameProfile;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.entity.living.player.PlayerJoinEvent;
import org.spongepowered.api.event.entity.living.player.PlayerQuitEvent;
import org.spongepowered.api.event.entity.living.player.DisconnectPlayerEvent;
import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
import org.spongepowered.api.event.game.state.GameStoppedServerEvent;
import org.spongepowered.api.event.network.GameClientConnectionEvent;
Expand Down Expand Up @@ -212,23 +211,23 @@ public void disable(GameStoppedServerEvent event) {
}

@Listener
public void onPlayerJoin(final PlayerJoinEvent event) {
final String identifier = event.getSourceEntity().getIdentifier();
public void onPlayerJoin(final GameClientConnectionEvent.Join event) {
final String identifier = event.getTargetEntity().getIdentifier();
final SubjectCache cache = getManager().getSubjects(PermissionsEx.SUBJECTS_USER);
if (cache.isRegistered(identifier)) {
cache.update(identifier, input -> {
if (event.getSourceEntity().getName().equals(input.getOptions(PermissionsEx.GLOBAL_CONTEXT).get("name"))) {
if (event.getTargetEntity().getName().equals(input.getOptions(PermissionsEx.GLOBAL_CONTEXT).get("name"))) {
return input;
} else {
return input.setOption(PermissionsEx.GLOBAL_CONTEXT, "name", event.getSourceEntity().getName());
return input.setOption(PermissionsEx.GLOBAL_CONTEXT, "name", event.getTargetEntity().getName());
}
});
}
}

@Listener
public void onPlayerQuit(PlayerQuitEvent event) {
getUserSubjects().uncache(event.getSourceEntity().getIdentifier());
public void onPlayerQuit(DisconnectPlayerEvent event) {
getUserSubjects().uncache(event.getTargetEntity().getIdentifier());
}


Expand Down
22 changes: 11 additions & 11 deletions permissionsex-sponge/src/main/po/keys.pot
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-03 14:05-0700\n"
"POT-Creation-Date: 2015-09-03 18:48-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -25,43 +25,43 @@ msgstr ""
msgid "Click to view more info"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:249
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:248
msgid "Could not rename old Bukkit configuration file to old name"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:207
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:206
msgid "Disabling %s"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:137
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:136
msgid "Error occurred while enabling %s"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:201
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:200
msgid "Error while loading data for user %s/%s during prelogin: %s"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:238
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:237
msgid "Migrating configuration data from Bukkit"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:128
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:127
msgid "Pre-init of %s v%s"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:369
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:368
msgid "Unable to get data source for jdbc url %s"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:292
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:291
msgid "Unable to get subject collection for type %s"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:240
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:239
msgid "Unable to move Bukkit configuration directory to location for Sponge!"
msgstr ""

#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:192
#: ninja/leaping/permissionsex/sponge/PermissionsExPlugin.java:191
msgid "Your appear to already be using a different permissions plugin: %s"
msgstr ""

Expand Down

0 comments on commit f391d02

Please sign in to comment.