eaglercraft/eaglercraft-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1.0.6) Fixed memleak in EaglerXBungee

Browse Source
This commit is contained in:
LAX1DUDE 2023-04-07 16:21:02 -07:00
parent 7d691a2967
commit af6d2ffc18
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar
View File

Binary file not shown.

5
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpServerQueryHandler.java
View File

@ -9,6 +9,7 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
@ -197,13 +198,13 @@ public abstract class HttpServerQueryHandler extends ChannelInboundHandlerAdapte
} }
public void sendBinaryResponse(byte[] bytes) { 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); buf.writeBytes(bytes);
context.writeAndFlush(new BinaryWebSocketFrame(buf)); context.writeAndFlush(new BinaryWebSocketFrame(buf));
} }
public void sendBinaryResponseAndClose(byte[] bytes) { 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); buf.writeBytes(bytes);
context.writeAndFlush(new BinaryWebSocketFrame(buf)).addListener(ChannelFutureListener.CLOSE); context.writeAndFlush(new BinaryWebSocketFrame(buf)).addListener(ChannelFutureListener.CLOSE);
} }

3
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SkinService.java
View File

@ -12,6 +12,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.logging.Logger;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
@ -858,7 +859,7 @@ public class SkinService implements ISkinService {
int cooldownPeriod = 60000 / EaglerXBungee.getEagler().getConfig().getAntagonistsRateLimit(); int cooldownPeriod = 60000 / EaglerXBungee.getEagler().getConfig().getAntagonistsRateLimit();
int elapsedCooldown = (int)(millis - antagonistCooldown); int elapsedCooldown = (int)(millis - antagonistCooldown);
elapsedCooldown /= cooldownPeriod; elapsedCooldown /= cooldownPeriod;
if(cooldownPeriod > 0) { if(elapsedCooldown > 0) {
antagonistCooldown += elapsedCooldown * cooldownPeriod; antagonistCooldown += elapsedCooldown * cooldownPeriod;
synchronized(antagonists) { synchronized(antagonists) {
Iterator<UUID> itr = antagonists.keySet().iterator(); Iterator<UUID> itr = antagonists.keySet().iterator();

2
gateway/EaglercraftXBungee/src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: EaglercraftXBungee name: EaglercraftXBungee
main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee 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 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 author: lax1dude

2
gateway_version
View File

@ -1 +1 @@
1.0.5 1.0.6