mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 01:29:32 +01:00
Rebuild
This commit is contained in:
parent
f9e5f65987
commit
56afbe3f71
3 changed files with 15 additions and 15 deletions
|
@ -1,14 +1,14 @@
|
||||||
From 4793f39be57f4440a7346ef536a1eaffe51ab9b7 Mon Sep 17 00:00:00 2001
|
From de755644734c4d38a0f6994b0c14bff2983216b6 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sat, 7 Mar 2015 21:07:10 -0600
|
Date: Sat, 7 Mar 2015 21:07:10 -0600
|
||||||
Subject: [PATCH] Toggle for player interact limiter
|
Subject: [PATCH] Toggle for player interact limiter
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index b639293..56cd3c9 100644
|
index 68358e9..7ea74c0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -660,7 +660,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
@@ -661,7 +661,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||||
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
|
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
|
||||||
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
||||||
boolean throttled = false;
|
boolean throttled = false;
|
||||||
|
@ -38,5 +38,5 @@ index ae3d107..ae410b6 100644
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
2.4.5.windows.1
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 848b736b0398bc45d2454cbb4eec473a4a0bafcf Mon Sep 17 00:00:00 2001
|
From 7f6d67f412bdc91a8f27531601123d4b9164fdfc Mon Sep 17 00:00:00 2001
|
||||||
From: Byteflux <byte@byteflux.net>
|
From: Byteflux <byte@byteflux.net>
|
||||||
Date: Mon, 1 Jun 2015 22:21:52 -0700
|
Date: Mon, 1 Jun 2015 22:21:52 -0700
|
||||||
Subject: [PATCH] Stackable Buckets
|
Subject: [PATCH] Stackable Buckets
|
||||||
|
@ -65,10 +65,10 @@ index 91ea70d..8e3d77e 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index 56cd3c9..67c7e5d 100644
|
index 7ea74c0..18d8d2d 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -61,6 +61,8 @@ import org.bukkit.inventory.InventoryView;
|
@@ -62,6 +62,8 @@ import org.bukkit.inventory.InventoryView;
|
||||||
import org.bukkit.util.NumberConversions;
|
import org.bukkit.util.NumberConversions;
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ index 56cd3c9..67c7e5d 100644
|
||||||
public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox {
|
public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox {
|
||||||
|
|
||||||
private static final Logger c = LogManager.getLogger();
|
private static final Logger c = LogManager.getLogger();
|
||||||
@@ -1629,6 +1631,19 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
@@ -1634,6 +1636,19 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||||
case ALLOW:
|
case ALLOW:
|
||||||
case DEFAULT:
|
case DEFAULT:
|
||||||
itemstack = this.player.activeContainer.clickItem(packetplayinwindowclick.b(), packetplayinwindowclick.c(), packetplayinwindowclick.f(), this.player);
|
itemstack = this.player.activeContainer.clickItem(packetplayinwindowclick.b(), packetplayinwindowclick.c(), packetplayinwindowclick.f(), this.player);
|
||||||
|
@ -170,5 +170,5 @@ index ab21bbf..aba8f87 100644
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
2.4.5.windows.1
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
From c43de820b2e0a4656f0286bbad15c20296c594a2 Mon Sep 17 00:00:00 2001
|
From 8b0fe684b14defdd3f55914bcbcc0502ac3ae95a Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Thu, 23 Jul 2015 04:29:22 -0700
|
Date: Thu, 23 Jul 2015 04:29:22 -0700
|
||||||
Subject: [PATCH] Add PlayerMicroMoveEvent
|
Subject: [PATCH] Add PlayerMicroMoveEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index 8c87c31..4902635 100644
|
index 18d8d2d..47a54a0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -62,6 +62,7 @@ import org.bukkit.util.NumberConversions;
|
@@ -63,6 +63,7 @@ import org.bukkit.util.NumberConversions;
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot
|
import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot
|
||||||
|
@ -16,7 +16,7 @@ index 8c87c31..4902635 100644
|
||||||
|
|
||||||
public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox {
|
public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox {
|
||||||
|
|
||||||
@@ -257,7 +258,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
@@ -258,7 +259,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||||
double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2);
|
double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2);
|
||||||
float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch());
|
float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch());
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ index 8c87c31..4902635 100644
|
||||||
this.lastPosX = to.getX();
|
this.lastPosX = to.getX();
|
||||||
this.lastPosY = to.getY();
|
this.lastPosY = to.getY();
|
||||||
this.lastPosZ = to.getZ();
|
this.lastPosZ = to.getZ();
|
||||||
@@ -267,7 +268,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
@@ -268,7 +269,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||||
// Skip the first time we do this
|
// Skip the first time we do this
|
||||||
if (true) { // Spigot - don't skip any move events
|
if (true) { // Spigot - don't skip any move events
|
||||||
Location oldTo = to.clone();
|
Location oldTo = to.clone();
|
||||||
|
@ -35,5 +35,5 @@ index 8c87c31..4902635 100644
|
||||||
|
|
||||||
// If the event is cancelled we move the player back to their old location.
|
// If the event is cancelled we move the player back to their old location.
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
2.4.5.windows.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue