View checkout-pr.sh
#!/usr/bin/env bash | |
if [ -z "$1" ]; then | |
echo "$0 <prID>" | |
exit 1; | |
fi | |
repo=$(git remote get-url origin | sed -E 's/(.*@)?github.com(:|\/)//g' | sed 's/.git$//g') | |
data=$(curl -q https://api.github.com/repos/$repo/pulls/$1 2>/dev/null) | |
url=$(echo -e "$data" | grep --color=none ssh_url | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g') | |
ref=$(echo -e "$data" | grep --color=none '"head":' -A 3 | grep ref | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g') | |
prevbranch=$(\git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') |
View checkout-pr.sh
#!/usr/bin/env bash | |
if [ -z "$1" ]; then | |
echo "$0 <prID>" | |
exit 1; | |
fi | |
repo=$(git remote get-url origin | sed -E 's/(.*@)?github.com(:|\/)//g' | sed 's/.git$//g') | |
data=$(curl -q https://api.github.com/repos/$repo/pulls/$1 2>/dev/null) | |
url=$(echo -e "$data" | grep --color=none ssh_url | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g') | |
ref=$(echo -e "$data" | grep --color=none '"head":' -A 3 | grep ref | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g') | |
prevbranch=$(\git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') |
View light.patch
diff --git a/src/main/java/net/minecraft/server/LightEngineThreaded.java b/src/main/java/net/minecraft/server/LightEngineThreaded.java | |
index 721f86a5405..e8223670017 100644 | |
--- a/src/main/java/net/minecraft/server/LightEngineThreaded.java | |
+++ b/src/main/java/net/minecraft/server/LightEngineThreaded.java | |
@@ -17,9 +17,10 @@ public class LightEngineThreaded extends LightEngine implements AutoCloseable { | |
private final ThreadedMailbox<Runnable> b; ThreadedMailbox<Runnable> mailbox; // Paper | |
// Paper start | |
private static final int MAX_PRIORITIES = PlayerChunkMap.GOLDEN_TICKET + 2; | |
+ private final java.util.concurrent.ConcurrentLinkedQueue<Runnable> priorityChanges = new java.util.concurrent.ConcurrentLinkedQueue<>(); | |
View redirect_out_of_order.patch
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java | |
index 2d512aa4f9a..34454a8efa6 100644 | |
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java | |
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java | |
@@ -1,5 +1,6 @@ | |
package net.minecraft.server; | |
+import com.google.common.collect.ArrayListMultimap; | |
import com.google.common.collect.Maps; | |
import com.mojang.brigadier.ParseResults; |
View optimizeblock.diff
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java | |
index b39554faf23..2c128feb0f8 100644 | |
--- a/src/main/java/net/minecraft/server/IBlockData.java | |
+++ b/src/main/java/net/minecraft/server/IBlockData.java | |
@@ -72,6 +72,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements | |
return this.c != null ? this.c.d : this.getBlock().b(this, iblockaccess, blockposition); | |
} | |
+ public final int getBlockedLight() { return this.c.e; } // Paper - OBFHELPER - trimmed as its cached | |
public int b(IBlockAccess iblockaccess, BlockPosition blockposition) { |
View gist:b70f65e0c55ca447ba750ef9d5640f78
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java | |
index 2c128feb0f8..b39554faf23 100644 | |
--- a/src/main/java/net/minecraft/server/IBlockData.java | |
+++ b/src/main/java/net/minecraft/server/IBlockData.java | |
@@ -72,7 +72,6 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements | |
return this.c != null ? this.c.d : this.getBlock().b(this, iblockaccess, blockposition); | |
} | |
- public final int getBlockedLight() { return this.c.e; } // Paper - OBFHELPER - trimmed as its cached | |
public int b(IBlockAccess iblockaccess, BlockPosition blockposition) { |
View PooledObjects.java
package com.destroystokyo.paper.util.pooled; | |
import net.minecraft.server.MCUtil; | |
import org.apache.commons.lang3.mutable.MutableInt; | |
import java.util.ArrayDeque; | |
import java.util.concurrent.ThreadLocalRandom; | |
import java.util.concurrent.atomic.AtomicLong; | |
import java.util.concurrent.locks.ReentrantLock; | |
import java.util.function.Consumer; |
View checkout-pr.sh
#!/usr/bin/env bash | |
if [ -z "$1" ]; then | |
echo "$0 <prID>" | |
exit 1; | |
fi | |
repo=$(git remote get-url origin | sed -E 's/(.*@)?github.com(:|\/)//g' | sed 's/.git$//g') | |
data=$(curl -q https://api.github.com/repos/$repo/pulls/$1 2>/dev/null) | |
url=$(echo -e "$data" | grep --color=none ssh_url | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g') | |
ref=$(echo -e "$data" | grep --color=none '"head":' -A 3 | grep ref | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g') | |
prevbranch=$(\git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') |
View watchdog.diff
diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java | |
index 3de19c998..c7dc8787c 100644 | |
--- a/src/main/java/net/minecraft/server/CrashReport.java | |
+++ b/src/main/java/net/minecraft/server/CrashReport.java | |
@@ -257,6 +257,7 @@ public class CrashReport { | |
} | |
public static CrashReport a(Throwable throwable, String s) { | |
+ if (throwable instanceof ThreadDeath) com.destroystokyo.paper.util.SneakyThrow.sneaky(throwable); // Paper | |
while (throwable instanceof CompletionException && throwable.getCause() != null) { |
View EnragedGhast.java
/* | |
* Copyright (c) 2017. Starlis LLC / dba Empire Minecraft | |
* | |
* This source code is proprietary software and must not be redistributed without Starlis LLC's approval | |
* | |
*/ | |
package com.empireminecraft.features.survival.mobs.enraged; | |
import com.empireminecraft.Worlds; |
NewerOlder