Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't require command for CUI init.

Browse Source
This commit is contained in:
wizjany 2019-05-29 23:15:00 -04:00
parent ec3648e521
commit 6ad274677f
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/CUIChannelListener.java
View File

@ -41,8 +41,9 @@ public class CUIChannelListener implements PluginMessageListener {
public void onPluginMessageReceived(String channel, Player player, byte[] message) { public void onPluginMessageReceived(String channel, Player player, byte[] message) {
LocalSession session = plugin.getSession(player); LocalSession session = plugin.getSession(player);
String text = new String(message, UTF_8_CHARSET); String text = new String(message, UTF_8_CHARSET);
session.handleCUIInitializationMessage(text); final BukkitPlayer actor = plugin.wrapPlayer(player);
session.describeCUI(plugin.wrapPlayer(player)); session.handleCUIInitializationMessage(text, actor);
session.describeCUI(actor);
} }
} }

13
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -782,9 +782,9 @@ public class LocalSession {
* *
* @param text the message * @param text the message
*/ */
public void handleCUIInitializationMessage(String text) { public void handleCUIInitializationMessage(String text, Actor actor) {
checkNotNull(text); checkNotNull(text);
if (this.failedCuiAttempts > 3) { if (this.hasCUISupport || this.failedCuiAttempts > 3) {
return; return;
} }
@ -794,13 +794,18 @@ public class LocalSession {
this.failedCuiAttempts ++; this.failedCuiAttempts ++;
return; return;
} }
setCUISupport(true);
int version;
try { try {
setCUIVersion(Integer.parseInt(split[1])); version = Integer.parseInt(split[1]);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
WorldEdit.logger.warn("Error while reading CUI init message: " + e.getMessage()); WorldEdit.logger.warn("Error while reading CUI init message: " + e.getMessage());
this.failedCuiAttempts ++; this.failedCuiAttempts ++;
return;
} }
setCUISupport(true);
setCUIVersion(version);
dispatchCUISelection(actor);
} }
} }

6
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/net/handler/WECUIPacketHandler.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.forge.net.handler; package com.sk89q.worldedit.forge.net.handler;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.forge.ForgePlayer;
import com.sk89q.worldedit.forge.ForgeWorldEdit; import com.sk89q.worldedit.forge.ForgeWorldEdit;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
@ -62,8 +63,9 @@ public final class WECUIPacketHandler {
} }
String text = event.getPayload().toString(UTF_8_CHARSET); String text = event.getPayload().toString(UTF_8_CHARSET);
session.handleCUIInitializationMessage(text); final ForgePlayer actor = adaptPlayer(player);
session.describeCUI(adaptPlayer(player)); session.handleCUIInitializationMessage(text, actor);
session.describeCUI(actor);
} }
public static void callProcessPacket(ClientCustomPayloadEvent event) { public static void callProcessPacket(ClientCustomPayloadEvent event) {

6
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CUIChannelHandler.java
View File

@ -57,8 +57,10 @@ public class CUIChannelHandler implements RawDataListener {
return; return;
} }
session.handleCUIInitializationMessage(new String(data.readBytes(data.available()), StandardCharsets.UTF_8)); final SpongePlayer actor = SpongeWorldEdit.inst().wrapPlayer(player);
session.describeCUI(SpongeWorldEdit.inst().wrapPlayer(player)); session.handleCUIInitializationMessage(new String(data.readBytes(data.available()), StandardCharsets.UTF_8),
actor);
session.describeCUI(actor);
} }
} }
} }