From a069652a3ba0866cac4c632565af03258a99c17b Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Wed, 2 Mar 2016 01:17:06 -0600
Subject: [PATCH] Configurable end credits when leaving the end


diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 5504cfe..6dc7e4c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -163,4 +163,10 @@ public class PaperWorldConfig {
         useAsyncLighting = false; //getBoolean( "use-async-lighting", false );
         log("World async lighting: " + useAsyncLighting);
     }
+
+    public boolean disableEndCredits;
+    private void disableEndCredits() {
+        disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
+        log("End credits disabled: " + disableEndCredits);
+    }
 }
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 2ec82a2..59ea36d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -525,9 +525,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     public Entity c(int i) {
         this.cj = true;
+        // Paper start - Allow configurable end portal credits
         if (this.dimension == 1 && i == 1) {
-            this.world.kill(this);
-            if (!this.viewingCredits) {
+            if (!this.viewingCredits && !world.paperConfig.disableEndCredits) {
+                this.world.kill(this);
+                // Paper end
                 this.viewingCredits = true;
                 if (this.a(AchievementList.D)) {
                     this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, 0.0F));
@@ -545,7 +547,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             } else {
                 this.b((Statistic) AchievementList.y);
             }
+        }
 
+        if (!(this.dimension == 1 && i == 1) || world.paperConfig.disableEndCredits) { // Paper - Allow configurable end portal credits
             // CraftBukkit start
             TeleportCause cause = (this.dimension == 1 || i == 1) ? TeleportCause.END_PORTAL : TeleportCause.NETHER_PORTAL;
             this.server.getPlayerList().changeDimension(this, i, cause); // PAIL: check all this
@@ -556,6 +560,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             this.cb = -1;
             return this;
         }
+
+        return null; // Paper - Theoretically it should never make it here
     }
 
     public boolean a(EntityPlayer entityplayer) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 08faf3a..5517a2d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -729,7 +729,8 @@ public abstract class PlayerList {
             return;
         }
 
-        exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();
+        // Paper - Configurable end credits, if a plugin sets to use a travel agent even if the cause is an end portal, ignore it
+        exit = cause != TeleportCause.END_PORTAL && event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();
         if (exit == null) {
             return;
         }
-- 
2.7.2