Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portal Mechanics (Closes #130) #1024

Open
wants to merge 30 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ad96125
First commit on this
heisluft Feb 7, 2019
f3db1db
Fixed imports
heisluft Feb 7, 2019
ab2915e
Renamed generic Portal variables to 'ender portal' in BlockEnderPorta…
VaiTon Feb 7, 2019
8c98b9c
Merge branch 'nether-portal' of https://github.com/VaiTon/Glowstone i…
heisluft Feb 7, 2019
6b442c0
Added proper portal checking
heisluft Feb 13, 2019
518999d
Merge branch 'dev' of https://github.com/GlowstoneMC/Glowstone into c…
heisluft Feb 13, 2019
c5ee5ba
Implement findOrCreate
Pr0methean Feb 15, 2019
5f0b8f0
Update NetherTravelAgent.java
Pr0methean Feb 15, 2019
c3d961f
Lombokify
Pr0methean Feb 15, 2019
7a6eec2
Bug fix
Pr0methean Feb 15, 2019
8f7da12
Fix the placing of portal blocks
heisluft Feb 16, 2019
2960c9f
Fixed compile error (Bukkit getCanCreatePortal vs. Lombok generated
heisluft Feb 16, 2019
08b584b
Dwelete debugging print statements
heisluft Feb 17, 2019
2a9d771
Fixed Logic for portal creation
heisluft Feb 17, 2019
7417ac4
Implement PortalCreateEvent
heisluft Feb 17, 2019
bdde48d
Implement Zombie Pigmen spawn and the destroying of portals
heisluft Feb 17, 2019
347eb38
Fix checkstyle errors
heisluft Feb 17, 2019
70713fd
Changed pigman spawn rate to vanilla value
heisluft Feb 17, 2019
97b12d8
implement portal creation by linking
heisluft Feb 21, 2019
ac789f8
Fix checkstyle video
heisluft Feb 22, 2019
ee11102
Renamed NetherTravelAgent to TravelAgentImpl as it will also be used
heisluft Feb 22, 2019
aa5dd7e
wired up travelagentimpl (now called GlowTravelAgent)
heisluft Feb 23, 2019
4a3463b
Fix checkstyle errors
mastercoms Apr 12, 2019
0f03af4
Merge branch 'dev' of https://github.com/GlowstoneMC/Glowstone into c…
heisluft Apr 28, 2019
517f540
Implement teleport to the nether and back
heisluft Apr 28, 2019
abb1290
Implement BoundingBox based portal entrance; Bugfix: Fire EnterEvent …
heisluft Apr 29, 2019
6af92fa
Fixed Checkstyle errors
heisluft Apr 29, 2019
69a4bb0
Applied suggestions
heisluft Apr 30, 2019
d31d8a0
Merge remote-tracking branch 'upstream/dev' into create-portal-event
heisluft Jan 9, 2020
8accf54
Applied suggestions
heisluft Jan 9, 2020
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
Prev Previous commit
Next Next commit
Dwelete debugging print statements
heisluft committed Feb 17, 2019

Verified

This commit was signed with the committer’s verified signature.
heisluft heisluft
commit 08b584b19d230dd32fd58960acadf60a15f962a5
4 changes: 1 addition & 3 deletions src/main/java/net/glowstone/util/pattern/PortalShape.java
Original file line number Diff line number Diff line change
@@ -82,8 +82,6 @@ && canBuildThrough(downImmutable(location).getBlock().getType())) {

// calculate portal height
height = calculatePortalHeight();
System.out.println(width);
System.out.println(height);
}

/**
@@ -191,7 +189,7 @@ private int calculatePortalHeight() {
}
}

for (int j = 0; j < this.width; ++j) {
for (int j = 0; j < width; ++j) {
if (offsetImmutable(bottomLeft, left, -j).add(0, height, 0).getBlock().getType()
!= Material.OBSIDIAN) {
height = 0;