mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
275173e538
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
20 lines
946 B
Diff
20 lines
946 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 22 Mar 2023 13:12:01 -0700
|
|
Subject: [PATCH] Fix api checking banned ips
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
|
|
index 0787159a6fde31260f87ee974381f21ce97620a6..5a7d884bcad7b30109567c1eff816a31c1701b06 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
|
|
@@ -64,7 +64,7 @@ public class CraftIpBanList implements org.bukkit.BanList {
|
|
public boolean isBanned(String target) {
|
|
Preconditions.checkArgument(target != null, "Target cannot be null");
|
|
|
|
- return this.list.isBanned(InetSocketAddress.createUnresolved(target, 0));
|
|
+ return this.list.isBanned(target); // Paper - fix checking banned ips
|
|
}
|
|
|
|
@Override
|