R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect merge

Browse Source
This commit is contained in:
embeddedt 2023-12-23 15:56:28 -05:00
parent d03571cb05
commit b23502c32b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java
View File

@ -42,11 +42,7 @@ public class BufferBuilderMixin {
try { try {
ByteBuffer buf = buffer; ByteBuffer buf = buffer;
// can be null if a mod already tried to free the buffer // can be null if a mod already tried to free the buffer
<<<<<<< HEAD if(!this.closed && buf != null && mfix$shouldFree) {
if(!this.closed && buf != null) {
=======
if(buf != null && mfix$shouldFree) {
>>>>>>> propagations/1.20
if(!leakReported) { if(!leakReported) {
leakReported = true; leakReported = true;
ModernFix.LOGGER.warn("One or more BufferBuilders have been leaked, ModernFix will attempt to correct this."); ModernFix.LOGGER.warn("One or more BufferBuilders have been leaked, ModernFix will attempt to correct this.");