diff --git a/Spigot-Server-Patches/Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/Avoid-dimension-id-collisions.patch
new file mode 100644
index 000000000..b433f0c1b
--- /dev/null
+++ b/Spigot-Server-Patches/Avoid-dimension-id-collisions.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brokkonaut <hannos17@gmx.de>
+Date: Tue, 25 Sep 2018 06:53:43 +0200
+Subject: [PATCH] Avoid dimension id collisions
+
+getDimensionId() returns the dimension id - 1. So without this patch
+we would reuse an existing dimension id, if some other dimension was
+unloaded before.
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 23663ede9..cb2255a5d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
+         boolean used = false;
+         do {
+             for (WorldServer server : console.getWorlds()) {
+-                used = server.dimension.getDimensionID() == dimension;
++                used = server.dimension.getDimensionID() + 1 == dimension; // Paper - getDimensionID returns the dimension - 1, so we have to add 1
+                 if (used) {
+                     dimension++;
+                     break;
+--
\ No newline at end of file