Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-233: Portal travel sound doesn't play


diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c4c5b16c42719c802c928c871858f2c99021c9db..e269df4726d977d7faf81a129fb8cff0a26158ac 100644
index 9b6214d194cbd43bf14345610c360ae9f790bab2..55720c1d66923863c3af263482128f0d700c745b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -719,6 +719,11 @@ public abstract class PlayerList {
@@ -724,6 +724,11 @@ public abstract class PlayerList {
exitWorld.chunkProviderServer.forceChunkLoad = before;

this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, false); // Vanilla doesn't check for suffocation when handling portals, so neither should we
Expand Down
161 changes: 0 additions & 161 deletions patches/dashspigot/server/0015-Fix-end-portal-logic.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ index 32752dfad24bc7883b1ab52e29834f1aa6fa60c6..4a72830071791321a2670302747fb36a
}

diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 1e757c65426abf15428beb9b04c73fac2d48bbda..46a90c5e43692bcfd30d007783a765eed6778fb3 100644
index 52c944a21e305701aa256de56e2951604e28672a..9557f736e884fe1400e8ca98cbe63c58bf9e84e1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1227,6 +1227,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1228,6 +1228,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.expTotal = this.newTotalExp;
this.exp = 0;
this.deathTicks = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Disable snooper


diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b6609daaaa8fc378515e85d031bd0151c103e8f6..361469f257da487f5f708651865e8916c46ae017 100644
index a76d3b9b73370568fbe34775ea7bcd8401f02d5c..55ae0803285dde275a0edd23e434b21c55da4a20 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -794,6 +794,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ Subject: [PATCH] Fix MC-10657: Entering portal while sneaking


diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 46a90c5e43692bcfd30d007783a765eed6778fb3..61e2032d62fee486b7195dd37d19bd0f9d846cfe 100644
index 9557f736e884fe1400e8ca98cbe63c58bf9e84e1..8bb792b3a5e9fb1ee15f3cf37f96000c4bb0a74b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -574,6 +574,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
TeleportCause cause = (this.dimension == 1 || i == 1) ? TeleportCause.END_PORTAL : TeleportCause.NETHER_PORTAL;
// DashSpigot end
@@ -575,6 +575,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
TeleportCause cause = this.dimension == 1 || i == 1 ? TeleportCause.END_PORTAL : TeleportCause.NETHER_PORTAL;
// PandaSpigot end
this.server.getPlayerList().changeDimension(this, i, cause);
+ this.setSneaking(false); // DashSpigot - Fix MC-10657: Entering portal while sneaking
// CraftBukkit end
this.lastSentExp = -1;
this.bM = -1.0F;
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index fa741ef0c840d53670ea05742dc6ba79e70413a7..09195ab55ac0e77afedf5a5f0ba8426c2dea993a 100644
index 55720c1d66923863c3af263482128f0d700c745b..ec4f637b1a0ae78048bba4ace61900a1a610a3a5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -189,6 +189,7 @@ public abstract class PlayerList {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Reset airTicks on respawn


diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 61e2032d62fee486b7195dd37d19bd0f9d846cfe..8bfab01628b210a2a46858c1c51f58637730ed9b 100644
index 8bb792b3a5e9fb1ee15f3cf37f96000c4bb0a74b..ba48cefd38f8b5428c97006fba09e589cfd9c040 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1222,6 +1222,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1223,6 +1223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

this.setHealth(this.getMaxHealth());
this.fireTicks = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ index 04916c6a8ee6446e786eb23c54ae78e8d2cba84d..8388bb5bae0c3b072b191b9d3655873f
public EntityFishingHook hookedFish;
public boolean affectsSpawning = true; // PaperSpigot
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9d2b4037119030eea027b7d79ab4f36f28af71ae..e613c8afd3b02b91f224dcdeab28277227fa2a84 100644
index bed9076fc52dc7a4f2ee3fe28c2a3f72fb6b0293..e9550824b63f7c6fc211ecee2e5ec0a9131f57ad 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1536,6 +1536,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
Expand Down
59 changes: 0 additions & 59 deletions patches/pandaspigot/server/0033-Optimize-Network-Queue.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ index 97699e7f86cef3ab8c4560066f0ef93c18a8f5ad..9bcfa3d9f26f88e704903d90695ab88b
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e613c8afd3b02b91f224dcdeab28277227fa2a84..0833bedc4efd3382e69bfe5fe371a81882ce8d1c 100644
index e9550824b63f7c6fc211ecee2e5ec0a9131f57ad..82c7de05cb6af9e179da419eed0545c16592320b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -41,7 +41,7 @@ import org.apache.logging.log4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ index c1110242136e8fd98661886920b765bb5367c37d..558ab56e5f2e670dc17e8ffd39d8f09d
this.b(world, blockposition, iblockdata, 0);
world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 3);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0833bedc4efd3382e69bfe5fe371a81882ce8d1c..afe357bef417fa542af2d022278d2b21c47fce4e 100644
index 82c7de05cb6af9e179da419eed0545c16592320b..919871cc851bba4067c0e6627c7b70faa1c96782 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -831,6 +831,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ index 0000000000000000000000000000000000000000..d61d44e8e1126ed3bea6e633cc0bdebb
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 22c0d4ee25fa7af7da46098d0f91ed697a9ea480..8ecfab0d739298a9f907bb2103f60cbf0cc4a84b 100644
index a9e86cdaeb6924adf2886a4804d51a32cd99f13c..b6fc419a5a5503fd6548ab0033994553f11fb490 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -113,6 +113,23 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
Expand Down
Loading