Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-07 03:02:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48 from Luccboy/master

Browse Source 
Updated Upstream (Waterfall)
This commit is contained in:
Juan Cruz Linsalata 2021-07-06 17:25:43 -03:00 committed by GitHub
commit c8bde4873d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit a5c78a961e091417914a7723d5d840c17b92f52e
Subproject commit 9dd430af6d1809020fc95637f86ba21340ccada1

8
Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch
View File

@ -1,4 +1,4 @@
From 6c410c530ba6004e34032a1460c644808dd230b1 Mon Sep 17 00:00:00 2001
From fb2700e20203d8aeb36b8f64b688df0b264cb9dc Mon Sep 17 00:00:00 2001
From: linsaftw <linsaftw@users.noreply.github.com>
Date: Sat, 20 Mar 2021 12:36:25 -0300
Subject: [PATCH] Fix ByteBuf memory leaks
@ -64,10 +64,10 @@ index 9e180c30..40c016d6 100644
con.unsafe().sendPacket( pluginMessage );
throw CancelSendSignal.INSTANCE;
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 13456b34..6d4b96cd 100644
index 09df5a93..67ef2cb4 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -141,11 +141,15 @@ public abstract class EntityMap
@@ -142,11 +142,15 @@ public abstract class EntityMap
if ( readId == oldId || readId == newId )
{
ByteBuf data = packet.copy();
@ -123,5 +123,5 @@ index cefa0206..8d4439ab 100644
}
--
2.31.1.windows.1
2.32.0.windows.1