diff --git a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar index 1437192..92e1ebc 100644 Binary files a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar and b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar differ diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpServerQueryHandler.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpServerQueryHandler.java index b313658..3a4cb47 100644 --- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpServerQueryHandler.java +++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpServerQueryHandler.java @@ -9,6 +9,7 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonParser; import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -197,13 +198,13 @@ public abstract class HttpServerQueryHandler extends ChannelInboundHandlerAdapte } public void sendBinaryResponse(byte[] bytes) { - ByteBuf buf = context.alloc().buffer(bytes.length, bytes.length); + ByteBuf buf = Unpooled.buffer(bytes.length, bytes.length); buf.writeBytes(bytes); context.writeAndFlush(new BinaryWebSocketFrame(buf)); } public void sendBinaryResponseAndClose(byte[] bytes) { - ByteBuf buf = context.alloc().buffer(bytes.length, bytes.length); + ByteBuf buf = Unpooled.buffer(bytes.length, bytes.length); buf.writeBytes(bytes); context.writeAndFlush(new BinaryWebSocketFrame(buf)).addListener(ChannelFutureListener.CLOSE); } diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SkinService.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SkinService.java index a1d1227..48d3ec7 100644 --- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SkinService.java +++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SkinService.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.function.Consumer; +import java.util.logging.Logger; import org.apache.commons.codec.binary.Base64; @@ -858,7 +859,7 @@ public class SkinService implements ISkinService { int cooldownPeriod = 60000 / EaglerXBungee.getEagler().getConfig().getAntagonistsRateLimit(); int elapsedCooldown = (int)(millis - antagonistCooldown); elapsedCooldown /= cooldownPeriod; - if(cooldownPeriod > 0) { + if(elapsedCooldown > 0) { antagonistCooldown += elapsedCooldown * cooldownPeriod; synchronized(antagonists) { Iterator itr = antagonists.keySet().iterator(); diff --git a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml index 41036da..4e97728 100644 --- a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml +++ b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EaglercraftXBungee main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee -version: 1.0.5 +version: 1.0.6 description: Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks author: lax1dude \ No newline at end of file diff --git a/gateway_version b/gateway_version index 1464c52..ece61c6 100644 --- a/gateway_version +++ b/gateway_version @@ -1 +1 @@ -1.0.5 \ No newline at end of file +1.0.6 \ No newline at end of file